Add in support for puppetdb
Add the backend parameter
Add missing brace
The activerecord package is backend == 'active_record' specific
Merge branch 'master' into support_puppetdb

Conflicts:
	manifests/master.pp
	manifests/storeconfigs.pp
Update apache::vhost for puppetlabs/apache-0.8.1
Merge branch 'support_puppetdb' into movealong
Add missing comma
Merge branch 'use_newer_apache' into movealong
Fix syntax error from bad merge
Merge branch 'support_puppetdb' into movealong
Let apache handle passenger
Let apache handle passenger
Merge branch 'use_newer_apache' into movealong
Fix up the vhost

Use the puppetlabs/apache 0.8 vhost features to more closely approximately what
was previously specified in the custom template.
Merge branch 'use_newer_apache' into movealong
Add missing comma
Merge branch 'use_newer_apache' into movealong