Hid google key in ENV
Merge pull request #6 from SalamanderMike/master

Hid google key in ENV
I went ahead and merged this since it was just a couple lines of code and nothing else
Merge pull request #7 from MooreJesseB/master

After merging Mike's pull request I accidentally reverted it somehow.  This is the fix.
Fixed map display bug
Merge pull request #8 from MooreJesseB/master

Rearrange Trips controller and views.
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Jesse's Merge
Merge pull request #9 from SalamanderMike/master

Fixed map bug
Moved explorify to trips
Navbar with routes
Merge pull request #10 from SalamanderMike/master

Moved explorify to trips
Merge pull request #11 from sbokaie/master

Navbar with routes
allow date ranges above seven days
Merge branch 'master' of github.com:TeamGlorious/explorify

Merge Conflict resolved - Recursive strategey