Only run Travis builds on master and staged branch
Improved readability
Thanks team turing. Addding in Isil's indexes
Merge branch 'master' of https://github.com/professor/whiteboard
Merge branch 'master' into grading_queue_ui

Conflicts:
	db/schema.rb