add scheduling tables
Merge branch 'master' of github.com:kmorrison/caltech into bryce_scheduled

Conflicts:
	jeeves/models.py
add scheduling tables
Merge branch 'master' of https://github.com/kmorrison/caltech into persist_schedules
Update migrate rooms