fixed tests
changes
Merge branch 'master' of https://github.com/Catsquotl/shifting-shifts-on-googlecal

Conflicts:
	lib/shift.rb
	test/get_events_spec.rb
Merge branch 'master' into tmpstash