updated vimrc from conflicts, updated readme