Merge the ical branch into Master

Created by: khaytsus

The iCal branch has been in use and testing locally for a while, and it's quite convenient so I'm merging it into Master now so it's the primary branch. Both iCal and local options are available, nothing has been taken away.