change heroku env vars
Merge branch 'mvc/smtp'

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