Merge branch 'master' of https://github.com/shaunsephton/django-ckeditor
Merge branch 'master' of github.com:natejlong/django-ckeditor