Merge pull request #8 from ryoung/master

fix deprecation warnings
fix formatting of the ckeditor