Vim Config improvements
Merge branch 'headless' into gui