Merge branch 'release/1.0.3' into develop
First pass at appending system and site variables on provision
Merge branch 'develop' into feature/nginx-server-vars

Conflicts:
	Vagrantfile
Merge branch 'feature/nginx-server-vars' into develop
Lock bakery to chef version 11 until supermarket recipies catch up
fix per-site variable handling

Allow empty configurations, and fix the syntax of the site config template.
restart nginx if anything changes in site template, not just on first creation.
be more explicit about the version of chef to use to expedite startup.
fix implementation of server environmental variables.
move php mod installation into bakery::configure recipe
fix bakery file permissions
Version Bump
Merge branch 'release/1.0.4'