Use QGIS 2.2 by default
Fix bug in 2.0.
Merge remote-tracking branch 'timlinux/develop' into develop
Revert "Use QGIS 2.2 by default"

This reverts commit 2d16c4a18d7643516b72c71b080b3597162bde9e.