Formatting
Should user repo_dir variable here incase of over-ride in project definition
Upgrade boxen gem to 2.0.3 to fix the public email issue

Fixes boxen/boxen#111
Merge pull request #405 from boxen/nginx-config-update

Should user repo_dir variable in nginx template
Upgrade boxen to 2.0.4
Merge remote-tracking branch 'upstream/master' into update-upstream-2

Conflicts:
	README.md
Merge pull request #35 from alphagov/update-upstream-2

Update against Upstream