Use canonical URL test
Use canonical URLs throughout
more fixes
Merge pull request #81 from stevepiercy/master

Use canonical URLs