Turning autoescaping back on

Should prevent XSS problems
Additional `safe` escaping
Merge pull request #708 from andrewhayward/autoescaping

Turning autoescaping back on