Makefile updated to reflect newest submodules.
Submodules updated.