More enhancements from Gary Bernhardt's .vimrc

ref. https://github.com/garybernhardt/dotfiles/blob/master/.vimrc