Minor changes to editor seletion.
Merge branch 'config'