+ fix nginx.conf typo
+another typo
Merge branch 'master' of https://github.com/codrem/vagrant-test-case

Conflicts:
	cookbooks/nginx/templates/default/nginx.conf.erb