submodule and vimrs changes
resolved .vimrc conflict re. theming overrides