google maps js code cleanup
Merge pull request #26 from vivekmshah/vivek

google maps js code cleanup
remove pesky orig files from mergetool
Merge branch 'master' into james
authorization complete exclaimation point