Updating FELIX/interface_with_cism/felix_driver.cpp and FELIX/CMakeLists.txt files as I had mistakenly
given Andrew B. incorrect ones to check in to the temporary_tpetra_newSTK branch, now master (sorry!).

Updating branch to be checked out in Irina K.'s and hopper nightly cronjobs
so they pull the master branch instead of the temporary_tpetra_newSTK branch of Albany.
Merge branch 'master' of github.com:gahansen/Albany