Update to support running both onbox and offbox
Will make configuration changes now
Various cleanups
Merge branch 'master' of https://github.com/datacenter/who-moved-my-cli