clean: consolidation code
Merge branch 'develop' of github.com:capensis/canopsis into develop