Updated submodule locations.
Updated submodules.
Fixed linker errors.
Merge pull request #15 from AshFurrow/submodule-update

@orta => Submodule update