Nginx max body size 1G, bundler 1.7.9
Merge branch 'master' of github.com:bensie/packer-templates

Conflicts:
	scripts/bootstrap.sh