Switched to lib/ version of submodules
Merged in a number of minor changes to main engine