Issues #18 and #42

* Restricts context changes to teachers, partially address #18 and #42, plus lots of bug fixes

* Merged with Rickshaw work, completed #42