Correct widths of bridges and tunnels for primary

The definitions for bridges and tunnels were the wrong way around.

This resolves #404.
Merge pull request #412 from math1985/primarybridgewidth

Correct widths of bridges and tunnels for primary