Renamed variables and added some more temporary files to delete.
Merge branch 'Joey' of ssh://github.com/OpenMBIR/openmbir into Joey

Conflicts:
	Code/Applications/TEMBIR/TEMBIRGui.cpp