Misc cleanups

Bit of a bag of diffs (sorry!)

1. Make the argparse code nicer (fix spelling, set metavars)
2. Some Python cleanups (avoid `len(list(dict.keys()))` in favour of `len(dict)`)
3. Remove unused text_label (grepped in here and in urwid source)
4. Whitespace