Refs #63 "Changes for user slug"
Merge branch 'master' of https://github.com/joshsoftware/intranet

Conflicts:
	app/controllers/users_controller.rb