Do a bunch of error checking when accessing models in controllers. Test them a bit to get over 85% coverage
Merge branch 'controller_checking'

Conflicts:
	app/views/teams/show.html.haml