Update modules for Cori after maintenance AND add intel18 option for Cori and Edison#1710

Merged

ndkeen merged 2 commits intomasterfrom ndk/machinefiles/intel18-option-nersc

Aug 14, 2017

+345-253

Commits on Aug 9, 2017

For all NERSC mmachines, add a --compiler=intel18 option and continue making
ndkeen
committed

Commits on Aug 11, 2017

After Cori maintenance in August 2017, some modules needed to be updated.
ndkeen
committed