use CIRCLE_BRANCH instead of figuring it out ourselves
Merge branch 'master' of github.com:mapzen/metroextractor-cities