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 branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
  Puppetfile
  Puppetfile.lock
  manifests/site.pp
fix bugs