Add switch for postgres
Add switch for webserver
Move the pillars back - doesn't work to have two trees
Vagrant: switch base image to debian-7.7
Switch to different local salt pillar strategy