Update C++ matching, so no STL
Add in ability to link to python config files