Switch to rewrite navigation URLs
Merge pull request #29 from wagnert/master

Switch to rewrite navigation URLs