Using hiera to set postgresql globals
Merge branch 'update_puppet' of github.com:colab-community/colab into update_puppet
Removed default nginx conf