Started to refactor the cli scripts a little bit
Merge branch 'cli-script-updates' of https://github.com/tboerger/crowbar into cli-script-updates

* 'cli-script-updates' of https://github.com/tboerger/crowbar:
  Started to refactor the cli scripts a little bit