License. Ours is BSD, dan's is MIT. Fixes #241
Merge branch 'v1' of github.com:mapbox/mapbox.js into v1