Merge pull request #280 from bherila/master

Fixes a couple of things and makes partial progress on other issues
Add infrastructure for ckeditor config.
Merge branch 'master' of github.com:n2cms/n2cms