new email verification: creates new user, but does not send email
Merge branch 'master' of github.com:ChuckNorristown/sample_app

Conflicts:
	app/controllers/users_controller.rb
	config/environments/development.rb
	config/environments/production.rb