add more args to turn off pulling
switch around the no-pull arg check
also turn off pulling for service manipulation
Merge pull request #387 from boxen/pull_less

don't auto-update on some local-only operations
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 'boxen/master'

Conflicts:
	Gemfile.lock