Merge pull request #2 from crankycoder/develop

sync the mozilla science repo
Merge branch 'develop' of github.com:mozillascience/OAButton into develop
changed mapid to use crankycoder's mapid
Merge pull request #248 from mozillascience/develop

swap out the mapid