mass_contact 5.x-2.2

This release corrects (hopefully) my faux pas of assuming which branch was being used for coding and beginning my updates in the wrong one. It includes the most updated code of the 5.x-1.x branch and the bug fixes and feature enhancements I added in the 5.x-2.x branch. Although I have done a large amount of testing of the code base, because of the massive merging of code I did, you should run this on a test system before going live to make sure there are no "gothas".