Updated for beta 7, including submodules.
Merge pull request #29 from AshFurrow/beta-7

Updated for beta 7, including submodules