Some enhancements from my old vimrc