Merge branch 'release/1.0.5' into develop
Fixes for null set of components and device components.
Component filenames must match contained class.
Generate pep8/pyflakes happy code.
Make nosetests happy again.
Fix merge conflict.
Fix pep8 issues.
lower case variables for json.
Allow comments in json.
Remove comment feature, as its broken.
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
Change Type to type on json input.
Allow custom defaults via a user config file.
Add User License support.