cleanup
Merge branch 'master' into cameron

Conflicts:
	templates/layout.erb