The comments aren't valid json, and it doesn't work on all editors
Merge branch 'master' of github.com:gorillamania/homedir