minor fixes
Merge branch 'master' of github.com:iamlemec/reallocation

Conflicts:
	mex/firmsim.cpp