Fix and update submodules.
Update ignores.
Remove debugging from Makefile.
Warning police.
Submodule update.
Merge pull request #452 from metajack/reorg-fixups

Reorg fixups