Merge pull request #737 from chrisglass/fix-user-config-writing