Merge branch 'master' of https://github.com/example42/puppet-nginx
Merge branch 'master' of https://github.com/example42/puppet-nginx
Merge branch 'master' of https://github.com/example42/puppet-nginx
Merge branch 'master' of https://github.com/example42/puppet-nginx
Merge branch 'master' of https://github.com/example42/puppet-nginx
Add test to prevent breaking the main conf
Add all of Debian's config dirs to the main config file

Not adding them breaks upstreams configurations
Merge branch 'upstreams_conf_issue'
Merge pull request #42 from netmanagers/master

Fix Debian configuration