COMMITTED VIA CIRCLECI: tilestache config update
Merge branch 'master' into dev