Did some cleaning up in vimrc