Crazy whitespace problems

* Carriage returns eating template, s/-%>/%>/g