updated codemirror
added support for erb and rhtml
updated ckeditor
added support for rhtml and erb templates
Merge branch 'codemirror_update'