Merge pull request #240 from SuperCowPowers/cli-work

Cli work
help cli snapshot
Merge branch 'master' into cli-work
just some cleanup and fixing bug around help not converting things to str()