Backoff on badstatuslines
make / render the index
ignore .DS_Store files
Added room objects
Merge branch 'master' of https://github.com/kmorrison/caltech into persist_schedules
add scheduling tables
Merge branch 'master' of github.com:kmorrison/caltech into bryce_scheduled

Conflicts:
	jeeves/models.py
add scheduling tables
Added interview types and basic scheduling rules
added chosenjs, added new page new_scheduler
Merge branch 'master' of https://github.com/kmorrison/caltech

Conflicts:
	jeeves/views.py
Add migration batch to move rooms from interviewers to rooms
Merge branch 'master' of https://github.com/kmorrison/caltech into persist_schedules
Merge branch 'master' of https://github.com/kmorrison/caltech
Merge branch 'master' of https://github.com/kmorrison/caltech into interview_rules

Conflicts:
	jeeves/models.py
fix a broken test
Merge https://github.com/kmorrison/caltech
remove some unused imports
Merge branch 'master' of github.com:kmorrison/caltech
Merge branch 'master' of github.com:kmorrison/caltech into kylem_preference_calendar

Conflicts:
	jeeves/models.py