Make the CLI more "Unixy"

Closes #67, #68.