Improve ferry rendering

* Render name for ferry routes (resolves #475)
* Resolve problems with overlapping ferries (resolves #457)