Dvogonen/automatically convert settings 511

The code for automatically converting the old setting (without destroying them) has been in for a while.
Now also changed all the config calls from companion9x, companion9x to companion, companion 
Ready to be merged into next