- greatly improved (and slightly broke ... it's a long story, read the
  README) the configuration generator
- moved remote status onto the same line as local status
- other various fixes