Fix up some CLI stuff

[nlf]

I don't like the spinner as it is now, it seems a little flaky. Occasionally it seems to forget what it's doing and print text in the wrong place.

I've also never been all that happy with any CLI package I've found for Go. I'm picky and none of them work quite how I'd like. I'll eventually put together something that works to my own ideals :)