Also load ubuntugis PPA for PostGIS 2.1, some syntax cleanup