Updated README and merge vimrc