Basic generator tests
Fixed merge conflict
Merge branch 'Generator-Tests'
Fixing generator script
Fixed merge conflict in generator.rb
Adding more manifest fields
Added more types. A list of types are in the README
Added more columns to the manifest