Misc CLI updates (still not usable)
Merge branch 'master' of github.com:agl/pond