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
Merge branch 'master' of https://github.com/boxen/our-boxen