update gitignore to not ignore pmag_menu (this causes irritating git problems in development branch)
Merge branch 'menubar'
minor fixes