Hotfix: Don't include Google Maps API code twice.
Merge pull request #551 from code-dot-org/test

DTP
Merge branch 'test' into staging
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging