Turned back on exclusion for MAc, it does conflict with system one
Merge branch 'new_lapack_moved_to_llnl_repo' into devel