Refactor site.canonical... methods

The methods were slightly clumsily named. Let's just merge them.
Merge pull request #122 from alphagov/refactor_site_canonicalize_methods

Refactor site.canonical... methods