removing bad code, humanizing content

really time to start submitting, we should get this going
Merge branch 'master' of github.com:floodric/CrunchTime

Conflicts:
	app/views/users/_form.html.erb