Merge branch 'master' of https://github.com/boxen/our-boxen

# By Peter Rhoades (9) and others
# Via Will Farrington (3) and others
* 'master' of https://github.com/boxen/our-boxen:
  bump boxen and change credential script to support 2fa.
  also turn off pulling for service manipulation
  switch around the no-pull arg check
  add more args to turn off pulling
  undo accidental changes to master
  also turn off pulling for service manipulation
  switch around the no-pull arg check
  add more args to turn off pulling
  Version bump to Puppetfile modules
  Bump Boxen Gem dependencies
  Fixes #379, adding directory type reference
  Updating nodejs and ruby modules
  Missed Homebrew module update to 1.4.1
  Boxen gem now v1.5
  Updating to ::boxen_user variable in anticipation of ::luser deprecation
  Update Puppet modules with the latest available
  Don't put our xcrun shim on path for 10.9
  Clean up inifile stuff from #362
  Updating Puppet modules
  We've moved the inifile module!

Conflicts:
	Puppetfile.lock
Merge branch 'master' of github.com:singuerinc/singuerinc-boxen

# By Nahuel Scotti (3) and Adam Ochonicki (1)
* 'master' of github.com:singuerinc/singuerinc-boxen:
  update
  update
  updated sequelpro + virtualbox versions
  Formatting

Conflicts:
	Puppetfile.lock
Merge branch 'master' of github.com:singuerinc/singuerinc-boxen

* 'master' of github.com:singuerinc/singuerinc-boxen:
  transmission with version
  removed .singuerinc from exec
  update modules version
  added php5_4+mysql moved sublimetext2 plugins
  change sublime source preferences
  update source tree version