#52 Finished unique names for category, item keys and added and
refactored code.
Merge branch 'master' of ssh://git@github.com/dmatej/cis-config.git