Simplify layout for portability to Windows
Portable font choices and backspace behavior
Merge branch 'master' of github.com:cwvh/vim

Conflicts:
	vimrc