Merge pull request #55 from gmacdougall/fix-2-2-install

Fix 2.2 installer incompatibility.
Merge pull request #57 from JDutil/2-2-stable

Merge pull request #55 from gmacdougall/fix-2-2-install