minor changes
resolved merge conflict
submodule updates
Merge branch 'master' of github.com:monotasker/myvim
submodule updates