make sure boost_not_in_BH/ comes before BH/include

This way if there is a bug in BH/include we can preclude it by putting the fixed file into boost_not_in_BH/
fix merge conflict