Switch up some browser dependent keys. Closes #200
Merge branch 'master' of https://github.com/mapbox/tm2