Simplify style.upload
Simplify source.upload
Merge pull request #590 from mapbox/simplify-upload

Simplify upload