Removed submodule, vimrc updates