Fix issue on Travis due to a PPA with PostGIS 2.1 conflicting with ubuntugis, so disable this PPA
Merge branch 'fix_travis_issue'