First bit of CLI code
Merge branch 'master' of https://github.com/neilcollins/piconga