mv cli-specific stuff to cli lib
Merge pull request #92 from Trott/cli-lib

mv cli-specific stuff to cli lib