Updated Trilinos and Armadillo
Updating the installer files for improved CLANG support
Updated config options for Trilinos
Merge branch 'master' into fmm (updated trilinos)