Selectively updated .gitmodules

Pulled the file .gitmodules (and that file only) from the experimental branch in
order to bring the master branch up to date on that file only.
Resolved submodule issue with bundle/surround.
Merge branch 'master' into experimental