select placeholder text
Merge branch 'master' of https://github.com/kmorrison/caltech
add tracker template
Merge branch 'master' of https://github.com/kmorrison/caltech
some tracker stuff
hooked up ajax to scheduler
Merge branch 'master' of https://github.com/kmorrison/caltech

Conflicts:
	jeeves/views.py
update with master
added mock dict back in
Merge branch 'master' of https://github.com/kmorrison/caltech
added new_scheduler_post
Merge branch 'master' of https://github.com/kmorrison/caltech

Conflicts:
	jeeves/views.py
Merged with master