added heroku gems
added rails 4 bin path
Merge branch 'master' into staging

Conflicts:
	Gemfile
	Gemfile.lock
Fixed raptor,removed inorganic stuff added test root for dropbox