Swapped out aloha editor for ckeditor, built in file upload in Ckeditor using stapler, various other bug fixes.