move shared files up to superclass
Merge branch 'master' into use-generator-super-class
refactor into a DefaultGenerator that's hidden in the package
Merge pull request #24 from sethladd/use-generator-super-class

move shared files up to superclass