Update bundle conf.
Reorganize vim conf.