Turns out since the QSettings isn't being deconstructed anymore, being in a singleton, we need to call sync() on it.  Fixed the username matching regex, and pulled it out so we can also use it to determine tree highlighting.  Fixed all the issues related to having two servers named the same.