Updated README, along with some cleanup in vimrc