Merge pull request #173 from rjc123/newsites

New Sites Prelaunch Mappings
fixed non-canonical url
fix more non-canonical urls