Removed conflicting submodules
Added .vimrc.after file
Updated .gitignore