Merge pull request #22 from ThomasFarrow/master

Added database.yml
Merge branch 'master' of https://github.com/Mozilla-cIT/puppet-manifests
Discourse.pill