eternal struggle against generated files
some changes
merge conflict fixed
fixing my typos and such before pushing
Merge branch 'master' of https://github.com/cjeffery/sworsorc