Added suport for building Redis servers with Vagrant and Puppet
PostgreSQL module for Vagrant
Merge conflicts