Merge pull request #62 from khawkins/master

2.2 Release: Merging unstable into master
Updates for 2.2.1 patch
Merge pull request #64 from khawkins/221_update

Updates for 2.2.1 patch