Migrate to vundle.
More tinkering.
Fix merge conflict.