Preferences calendar kind of working
Merge branch 'master' of github.com:kmorrison/caltech into kylem_preference_calendar

Conflicts:
	jeeves/models.py
Working
Added pushplans
Merge branch 'master' of github.com:kmorrison/caltech