Update Travis install script to use PostGIS 2
Merge branch 'heroku-deploy' into core-admin-manager to keep them in sync