added chosenjs, added new page new_scheduler
Merge branch 'master' of https://github.com/kmorrison/caltech

Conflicts:
	jeeves/views.py
Merge branch 'master' of https://github.com/kmorrison/caltech