Ryan build update

Updates to build system and Flow/System.cpp to bring back into compliance with external libs/tools.