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