Add settings and keybindings for autocompletion
Merge branch 'master' into laptop