cleaned up vimrc
merge