Merge pull request #115 from wshafer/master

Removed unneeded services
Merge pull request #116 from wshafer/master

Fix for non CMS pages
Merge remote-tracking branch 'upstream/master'
Fix for save on sitewides