Changes vim config
Merged with trunk