Move config back into if blocks
Add Postgres 9.3 and 9.4 test configurations