Some minor cleaning up in vimrc