Removed merge comments from .gitmodules

I'm just playing with Github here. You can ignore if ye want. But I think theres a problem with yer submodules file. Looks like a merge conflict got staged.