o Little readability tweaks
  - have includes sorted
  - easier to read bind-addr parsing and printing.
  - sorting commandline options by context