Properly maintain .gitmodules entries