leaving wysi in plain text mode
Merge branch 'master' of https://github.com/gitaaron/wysiwyg_evaluation