Remove postres
Add Nginx fixes
Merge branch 'master' of github.com:ryanburnette/chef-solo

Conflicts:
	cookbooks/postgres/recipes/default.rb