CDB-3079 postgres addon from travis as basic setup
Merge branch 'CDB-3079' of https://github.com/CartoDB/Windshaft into CDB-3079

Conflicts:
	.travis.yml