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

Resolve recursive merge
populate trips#index with random thumbnails
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.