Add support for the intel compiler when we want extra compiler flags.
Merge branch 'add_icc_support'