Refactor cli_spec with more structure.

Adding `describe` blocks and moving stuff around. There was some duplication in the `--format emacs` testing so I removed one example.

This is to make future additions easier, and to make the output from `rspec -e CLI -f d` easier to read.