Reinstate code, install postgis-2.0 package.

The issue appears to be caused by conflicts between the already
installed postgresql-9.1-postgis-2.1 and things coming from ubuntugis.