new loadconfig option
Merge branch 'josh'
in the process of splitting LocalSocket
merged Bruno's changes
implemented SaveConfig