Tweaks to error handling.
Smooth out style upload flow. Refs #403.
Merge pull request #514 from mapbox/style-upload-flow

Style upload flow
Merge branch 'master' into direct-upload

Conflicts:
	index.js