Routing improvements across the site
Merge pull request #55 from NathanCastle/routing2

Routing improvements across the site