added some gems for heroku
added some gems for heroku
Merge branch 'master' of heroku.com:dry-bayou-7565

Conflicts:
	Gemfile
removed validation of username in user.rb and fixed devise issues with rails 4