Added vim-bufonly as submodule
Resolving conflict.