Got rid of wysiwyg.js
Merge branch 'master' of github.com:derekchen14/notableBeta