Fixes #379, adding directory type reference
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.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Puppetfile.lock