Add more functionality to CLI.
Merge branch 'master' of github.com:jneem/puertorico