unicorn if you want it, heroku stuff, cleaner/faster uploading
Merge branch 'master' of https://github.com/jcburke14/dugong

Conflicts:
	app/controllers/data_sets_controller.rb
	app/mailers/user_mailer.rb