Revert "Travis: only use Apache as web server"

This reverts commit 41bb73fd16eb717c17ec7d0c5609de38b0d612fd.

Conflicts:
	scripts/travis_before_script.sh
Travis: use port 8080 instead of 80

Fixes build errors with PHP built-in web server. By using port 8080, we
no longer need to use sudo since it's only needed for port 80.
Travis: delay before creating db with pgsql

We occasionally get build errors with pgsql when creating the database

psql: could not connect to server: No such file or directory
	Is the server running locally and accepting
	connections on Unix domain socket "/var/run/postgresql/.s.PGSQL.5432"?

Adding a short delay before calling psql should hopefully reduce the
frequency of these errors.