Code tidying, fixed a bug or two
Merge branch 'master' of github.com:Raggles/HC.SysCfgTools