Add emergency reset feature to cons to prim inversion
Have magnetar problem utilize new emergency resets
Make minor changes to magnetar.cpp source
Merge branch 'master' of github.com:jzrake/ctf

Conflicts:
	ctf-core/run-mara.lua