Update macvim install in README and small changes in vimrc