Cleanup, Work on user form
Merge branch 'master' of github.com:alecspopa/eval.ninja

Conflicts:
	eval/app/views/users/show.html.haml