Adding users, updating docs and coverage
Documentation updates

Basic documentation updates, just trying to make things consistent at
this point.
Merging down changes

Conflicts:
	app/models/course.rb
	app/models/location.rb
Cleaning up a useless .keep