porting Instagram data to maps
Merge branch 'master' of git://github.com/TeamGlorious/explorify

Conflicts:
	.gitignore
	app/views/trips/show.html.erb
Merge from Shawn
Merge pull request #31 from SalamanderMike/master

Ported trip data into maps