Refactored the command model to simplify it and resolve some issues with how arguments are parsed
Improve help formatting
Remove obsolete code
Merge remote-tracking branch 'origin/master' into octopus-2.0