added some google calendar stuff
Merge branch 'master' of github.com:objectpartners/petulant-adventure

sloppy merge