Resolved submodule issue with bundle/surround.