Upgrade Aquamacs to 3.1
Merge pull request #6898 from crainiarc/aquamacs

Upgrade Aquamacs to 3.1