Putting in suggestions from Mike Berry to improve build for MIC
Merge branch 'master' of github.com:losalamos/CLAMR
Merging in build changes for MIC