Merge pull request #8 from jirish/master

CMS field clean up, 3.1 static updates, template work in Simple. Fixes #7