Merge branch 'config'
Merge branch 'config'
Merge branch 'config' into editors
Finished adding support for vim.
Minor changes to editor seletion.