Merge pull request #8 from SalamanderMike/master

Map MVP Working
Some login and signup partials.  Bootstrap styling
merge conflicts resolved
Merge branch 'master' of github.com:TeamGlorious/explorify

Recursive Merge
Add OAuth for Instagram
Merge branch 'dev'

Merge Conflict Resolved
Merge pull request #1 from MooreJesseB/master

Major screw up.  This pull request restores everything before I messed it up.
Drawing lines between markers