update tests for mapid in data.yml
Merge branch 'direct-upload' of github.com:mapbox/tm2 into direct-upload