Merge branch 'master' of github.com:ipetepete/nodebb-plugin-redactor-editor
more cleanup
Fixing history again