Should user repo_dir variable here incase of over-ride in project definition
Merge pull request #405 from boxen/nginx-config-update

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