Fixed the rescan-on-every-load bug!  And a few other things
Merge 'rrld_planB' into 'testing', plus a couple more minor fixes

Conflicts:
	armoryengine.py