bump boxen-xquartz to 1.2.1
Merge pull request #663 from MarkVillacampa/master

bump boxen-xquartz to 1.2.1
Upgrade boxen gem to 2.7.0 with Yosemite support

... including dependency on Puppet 3.7
Upgrade puppet modules for Yosemite support
Merge pull request #664 from boxen/yosemite

OS X 10.10 Yosemite support
test again refactor
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
	Puppetfile
	Puppetfile.lock
	vendor/bundle/ruby/2.0.0/cache/facter-2.1.0-universal-darwin.gem
Try to fix