Updating help/CLI
Merge branch 'master' of https://github.com/rex/rex-template