Bridge Repairs

This merges paths and steps in with the roads layer (from the lines layer) and fixes z-ordering interactions.  Ferries are split so they are displayed beneath bridges.

Cycle routes are re-prioritized (local, regional, national) and support is added for `layer` tags so that layering can be explicitly controlled.