re-added two submodules. Grrr.
Merge pull request #625 from MartijnR/master

re-added two submodules. Grrr.
Merge pull request #626 from SEL-Columbia/master

re-added two submdoules