submodule updates
Merge branch 'master' of github.com:monotasker/myvim
vimrc update and resolving merge conflict