Removing submodules.
Moving my submodules into bundles.
Miscellaneous minor updates.
Resolve conflicts from merge.