Merge branch 'master' of github.com:seagoj/cookbook-nginx

Conflicts:
	recipes/default.rb