cleaned up routes, helpers
Merge remote-tracking branch 'origin/user-login-round-2'

Conflicts:
	mano/app/views/sessions/new.html.erb