modified:   igrf.py => fixed small bug in calling doigrf
	modified:   upload_magic.py
add to generic_magic.py help massage
Merge branch 'master' into pyinstaller
adapt PMD_magic for use as a module and integrate it with QuickMagic
convert TDT_magic for use as module, integrate with QuickMagic
convert old HUJI_magic for use as a module, incorporate into QuickMagic
finish HUJI magic conversion to module.  Also add cooling rate functionality to QuickMagic HUJI import
convert generic_magic so it can be imported as a module, integrate with QuickMagic.  also add functionality so that it works correctly with cooling rate, ATRM, and AARM type experiments