Clean up generator defaults
Add .travis.yml
Remove weird unneeded crap
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into wysihtml5 branch.

* make sure I have all chadoh's changes added into my 'wysihtml5'
  branch before I submit pull request.