Improve ferry rendering

* Render name for ferry routes (resolves #475)
* Resolve problems with overlapping ferries (resolves #457)
Merge branch 'ferry' of https://github.com/math1985/openstreetmap-carto into math1985-ferry
Merge branch 'math1985-ferry'