Merge pull request #217 from am11/master

Updated Zencoding updating formatting issues
Improved regex for less post processing