fix failing tests

* tests failed on a local changes site.yml
* somehow universal_newline leaves \r, so bring back gsub to remove them