Added charset encoding
Removed the DisableCharset option, left default as it was
Merge branch 'charset' of github.com:cojac/martini-contrib into cojac-charset