I18n header changes

Two commits, one to try resolving the issues with the current tests, and another to do all escaping in the new quote method. I'm not certain the latter is required, but now we've got a test to ensure that it succeeds going forward.

If you merge this, it'll make it into your PR - thought this was a nicer way of helping out on this feature rather than whining about things that needed fixing. That said, if you've got another way to fix this, feel free to close this and do it yourself.

Easiest way to get all tests to run (and as of this pr, pass) is to run `mvn clean install` - if that isn't working for you, please let me know.

Again, thanks for your contribution, and looking forward to any other ideas you have.