Merge pull request #2 from dominichamon/master

pull in latest submodules