Merge pull request #15 from SalamanderMike/master

Connected trips/show
Merge pull request #16 from SalamanderMike/master

semicolon
Trip contoller adjustments
Merge branch 'master' of github.com:TeamGlorious/explorify

Resolve recursive merge
Merge pull request #17 from SalamanderMike/master

Search for location works
I merged this because I only touched my own javascript in one file
populate trips#index with random thumbnails
Merge pull request #18 from SalamanderMike/master

Added click info to markers
I merged this because I only effected my js file and no others
Remove location bool from media
33 instagram photo algorithm fix.  Make media edit page.
Merge branch 'master' of github.com:TeamGlorious/explorify

Recursive merge fix
remove datepicker files.  Library was unnecessary
Merge branch 'dev'

recursive merge conflict
change media column long to lng
Merge branch 'dev'

recursive merge conflict
Merge pull request #19 from MooreJesseB/master

Lotsa stuff.
Merge branch 'master' of git://github.com/TeamGlorious/explorify

Conflicts:
	Gemfile
	Gemfile.lock
Jesse's Merge