rm dead (I think) code
Merge remote-tracking branch 'trott/streamline'

Conflicts:
	web/application/views/course/course_manager_dom.js