Updates, minor changes to vimrc