Fixed compilation, now compiles against latest library API.

The composite branch doesn't compile against the latest code from the other libraries. I updated it so that it will compile - but this will force you to update your other git submodules.

I assume my permission work should go off this branch?