Merge conflict
Use puppetlabs-postgresql 3.x module
Merge pull request #21 from mcanevet/postgresql-3.x

Postgresql 3.x