Add git_sha function to Mara's Lua API
Add emergency reset feature to cons to prim inversion

Conflicts:
	Mara/hydro.cpp
Include emergency reset as final step in magnetar strategy
Fix a bug in the Mara.git_sha function
Add a background field, Bz, parameter to the magnetar problem
Merge commit 'a2bf36f9b2c3e0b0b0e1330a269aca3415700508' into magnetar-stable

Conflicts:
	ctf-core/run-mara.lua
Merge branch 'magnetar-stable' into volume-source

Conflicts:
	Mara/hydro.hpp
	Mara/magnetar.cpp
	Mara/magnetar.hpp
	ctf-core/run-mara.lua
Update Mara to support flux and also volume source terms

There is also a wind problem now, which will test the volume source term
in various ways.