The shared code between the two plugins is now in a single set of files. The addins cleanup after themselves resovling the duplicate menu items problem. They also clean up duplicate menu items added by older versions.
Merge remote-tracking branch 'origin/master'