Update Puppet modules with the latest available
Updating to ::boxen_user variable in anticipation of ::luser deprecation
Boxen gem now v1.5
Missed Homebrew module update to 1.4.1
Merge pull request #366 from createdbypete/update-puppetfile

Updating to latest available Puppet module versions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Puppetfile.lock
bump ruby manually

not waiting for our-boxen to catch up on this one since the bundler
thing annoys me
bump bower to 1.0