Minor updates to match latest Vundle.
Re-ordered lines.