Updated to most recent vimrc plugin set