Updates to stay current with the FEvoR library
Merge branch 'fevor' of github.com:pism/pism into fevor

Conflicts:
	src/fevor/PISMFEvoR.cc

Toe stepping ha.