Listen on wildcard (*) subdomain
Removing redirect for www. subdomain, seems unnecessary
Updating Puppetfile module versions with latest
Update Boxen Gem version to latest
Merge pull request #348 from createdbypete/update-puppetfile-and-gems

Update puppetfile and gems
Quick update to std lib
Adding Xquartz missing dependency for Ruby module
Merge pull request #353 from createdbypete/update-puppetfile-and-gems

Add missing Xquartz dependency
Fix up cycle due to git class and updated home-brew module, fixes #354
Fix typo in Repository default require path
Merge pull request #343 from createdbypete/projects/nginx-wildcard

Add Nginx wildcard subdomain to projects template
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Puppetfile
	Puppetfile.lock
update nodejs
everyone gets bower and grunt
Merge branch 'master' of https://github.com/mroth/my-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock
	modules/team/manifests/environment.pp