Merge pull request #28 from SalamanderMike/master

End of evening commit
Merge pull request #29 from SalamanderMike/master

Add production gem for Heroku deployment
morning governa
merge solved trips data
Merge pull request #30 from sbokaie/master

ENV var setup + minor styling
Merge branch 'master' of git://github.com/TeamGlorious/explorify

Conflicts:
	.gitignore
	app/views/trips/show.html.erb
Merge from Shawn