Fix extent

This solves #554
Also fix mercator extents
Merge branch 'fix-extent' of https://github.com/math1985/openstreetmap-carto into math1985-fix-extent

Conflicts:
	project.mml
Merge branch 'math1985-fix-extent'