rename pmag_dialogs to pmag_basic_dialogs (eventually will distinguish between that and pmag_menu_dialogs)
Merge branch 'master' into MagIC_beta

Conflicts:
	.gitignore
Merge branch 'master' into MagIC_beta

Conflicts:
	QuickMagIC.py
"fix" quit problem.  but in a weird manner (creating a phantom menu).
add options for ATRM/AARM n in generic magic import.
add CR option; rollback changes in ATRM and AARM, because they aren't needed!
clean up miscellaneous comments and get Earth Ref Magic Builder help to pop to front
keep menubar invisible for now
Merge branch 'master' into menubar