Revert "Enable control-socket by default, but only for root"

This doesn't work on OSX.

This reverts commit 7eadf64919d046216a3d9c6504b6aa9d2f037b57.
Be more generous about values for correct escapes
Skip both characters, not just the escape.  Closes #842