Bump Boxen Gem dependencies
Version bump to Puppetfile modules
add more args to turn off pulling
switch around the no-pull arg check
also turn off pulling for service manipulation
undo accidental changes to master

This reverts commits 5b4b7223c2a5ff0863b42b8eae5de1c937d77659,
fe2933519cb621acaa0bdc8815850a3362b63392, and
9f2cfbaed041e6f62741c7de3deafb9852a42591.

This gets us back to 11ea991577f3785ddb6067dca68c11240be3db08.
add more args to turn off pulling
switch around the no-pull arg check
also turn off pulling for service manipulation
bump boxen and change credential script to support 2fa.
Merge pull request #396 from boxen/two_factor_support

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

Conflicts:
	Puppetfile.lock