Merge pull request #7 from joshuamaxwell/google-map

Google map +1
Merge pull request #9 from joshuamaxwell/login-options

Merge pull request #7 from joshuamaxwell/google-map - try 2