Fix deviceType property propogation.
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