Merging in upstream changes for review

There were conflicts in:
    * attributes/default.rb
    * definitions/nginx_site.rb