Clean up of SCons in preparation to move to CMake (#1)