Fix and update API
Merge branch 'v1' of github.com:mapbox/mapbox.js into v1