Get the build working with XCode, update submodules, cleanup.

A bit of work needed to be done here, namely handling CMAKE_CFG_INTDIR,
simplifying test structure, checking target link requirements, working
around system include dir quirks in XCode, etc