re-organize & rename dialogs, working picture of import orient.txt files from menubar
add more functionality to QuickMagic orient.txt import
Merge branch 'master' into menubar

Conflicts:
	QuickMagIC.py
	pmag_menu.py
	pmag_widgets.py
update gitignore to not ignore pmag_menu (this causes irritating git problems in development branch)
add -ID functionality to orientation_magic.  finish with orientation_magic implementation in QuickMagic.py (QuickMagic will NOT allow for over-writing of existing er_* files)
partial functionality into QuickMagic menu for import AzDip type file
replacing "sampling particulars" with sampling_particulars widget
add standard buttons widget.  replace old button implementation in QuickMagic
Merge branch 'menubar'
minor fixes