Merge pull request #405 from stp/msoos-better_cms_import

Cleaner CMS include and better include location