Various changes and additions in ~/.vimrc