Updates to .vimrc, plugins & README