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
Update a bunch of modules
Update a bunch of gems
Update default to mavericks.

Merge branch 'mavericks-updates'

Conflicts:
	Puppetfile.lock