Configure old BHC domain on redirector
Merge pull request #394 from rjc123/newmappings

Configure old BHC domain on redirector
Resolve failed test for directgov
Merge pull request #395 from rjc123/newmappings

Resolve failed test for directgov
Resolve test failures for BHC
Resolve test failures for BHC
Merge pull request #396 from rjc123/newmappings

Resolve test failures
Add aliases for bonavacantia
Tests for BV aliases
Merge pull request #397 from rjc123/newsites

Add aliases for bonavacantia
Remove blank line
Fix problematic tabs in sites.yml and script

The tabs were causing some YAML parsers to fail. Replacing them with spaces
solves that problem, though I don't know if the trailing whitespace will cause
others.
Remove spurious tabs
Merge pull request #399 from rjc123/newsites

Remove spurious tabs
Fix conflicts in merge