Bump version
Update readme
Remove extra copy of generator
Include test for generator
Refactor generator