nged puppet.conf server config
Merge branch 'master' of https://github.com/xirago/xirago_puppet

# By xirago
# Via xirago
* 'master' of https://github.com/xirago/xirago_puppet:
  Delete puppetdb.conf
  Delete fileserver.conf