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 remote-tracking branch 'monterail/master'

Conflicts:
	vendor/cache/boxen-2.0.3.gem