Modifications to CmakeLists.txt to pick up MPI and Python include directories on
some systems.