Tweak intro language
Merge
Merge branch 'fixed-layout' of github.com:mapbox/mapbox.js into fixed-layout

Conflicts:
	_posts/api/0200-01-01-v1.6.0-all.html
	_posts/api/0200-01-01-v1.6.0.html