Improvements from http://amix.dk/vim/vimrc.html