Fix merge conflict.
Fix pep8 issues.
lower case variables for json.
Allow comments in json.
Remove comment feature, as its broken.
Fix merge conflict.
Fix pep8 issues.
lower case variables for json.
Allow comments in json.
Remove comment feature, as its broken.
Merge branch 'feature/type' of https://github.com/zenoss/ZenPackGenerator into feature/type
Change Type to type on json input.