Clean up even more naughtiness

A little birdie told me about  https://github.com/cloudfoundry/cli/commit/2dc2f44fd40f4efa9daa4683e09cda585820994c and I thought ... hmmm ... it looks like we might have
missed a few words here and there.

I think a lot of this is open to interpretation, but I mostly followed the work
of @lvarvel and @crhino and found other "words of interest" around their diff.
Merge pull request #224 from tjarratt/naughty-by-nature

Clean up even more naughtiness