migration to puppetlabs/postgresql module
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules
add/reorder default postgres access rules
reimport backup script after migrating to new pgsql module
postgresql streaming replication setup
place reject rule at the end
enable db1 as replication master
revert to 'ident' as 'peer' was introduced post-8.4
add puppet config version tag in riemann events
Merge remote branch 'github/master'