Merge pull request #3 from scotato/master

Enhancements to CMS module
Cleaned up CMS plugin
Reworked viewdir inclusion
Reworked viewdir inclusion
Include default layout