outgoing email WIP
Merge branch 'master' of github.com:UW-Advanced-Rails-2014/portfolio
Adding Spring back in, all I had to do was `spring stop` to restart spring
merging in comment mailer and all recent work

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/comments_controller.rb