Keep esc functionality
Merge branch 'master' of https://github.com/Algid/vimfiles

Conflicts:
	vimrc