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.
Fix conflicts in merge
Merge pull request #400 from rjc123/master

Removing problematic tabs