Add Ruby 2.1.2 to the README
Merge pull request #656 from adamnbowen/patch-2

Add Ruby 2.1.2 to the README
Typo
Merge pull request #658 from gfestari/typo

Typo
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
Update FAQ to ensure proper bundle --path
Merge pull request #680 from seanknox/master

Fix typo in FAQ
Update sync script to the latest from @dgoodlad

As gisted at https://gist.github.com/dgoodlad/34f429d1b84a471933d3, and
linked from https://github.com/boxen/puppet-homebrew/issues/60, this is
the latest sync script used by Github's our-boxen. It uses the newer
aws-sdk-core gem, and apparently actually works.
Merge pull request #686 from indirect/newest_sync_from_dgoodlad

Update sync script to the latest from @dgoodlad
just keeping it fresh
Merge pull request #687 from boxen/update-puppet-modules-and-gems

Update Puppetfile and Ruby Deps
Install NodeJS using `nodejs::version`

The latest major release of puppet-nodejs, removed the versions classes:

    https://github.com/boxen/puppet-nodejs/releases

Cc: @tarebyte, @rafaelfranca
Merge pull request #688 from johnsyweb/fix-site-pp

Install NodeJS using `nodejs::version`
Dots, not underscores!

Addresses #689
Merge pull request #690 from johnsyweb/fix-site-pp

Dots, not underscores!
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
	Puppetfile
	Puppetfile.lock