pulled devel to master in vimconfig