Formatting changes
Merge branch 'master' of https://github.com/edlandm/vim
Fixes background-color issue with xterm-256color terminals