Fix typo.
Update boost building script to use b2 instead of bjam
Revert "Set Intel related Boost.Config macro back to CMake, fix order of includes issue"

This breaks out of tree builds, including Octopus.

This reverts commit d6323c341f679f367337fd88c95124635e145430.