refactor
merge conflict
rename of Configdialog to match other file names
changed some working of autocomplete
Merge branch 'master' of https://github.com/andrewchambers/aedit