Squashed commit of the following:

commit bf07ec995a18f0d612e31dc253de1a107e75b1f0
Author: Takashi Yoshida <takashi@takashiyoshida.org>
Date:   Mon May 19 22:03:26 2014 +0800

    Bump versions in Puppetfile

commit 06e6f4aeb527381e6866d8ce1de53885eadcd49f
Merge: 60b455c 5aadcf5
Author: Takashi Yoshida <takashi@takashiyoshida.org>
Date:   Mon May 19 17:11:35 2014 +0800

    Merge remote-tracking branch 'upstream/master' into bump-version

    Conflicts:
    	Puppetfile.lock

commit 5aadcf5d9d27ab1d72230d586611f8af1944d17c
Merge: d254b36 51497a0
Author: Sam Kottler <shk@linux.com>
Date:   Wed May 7 20:08:19 2014 +0600

    Merge pull request #590 from jakecraige/master

    update Puppetfile homebrew version

commit 51497a0510bfa4feaa83b041e9884cb6c48a93d1
Author: Jake Craige <jake@poeticsystems.com>
Date:   Wed May 7 09:03:10 2014 -0500

    update Puppetfile homebrew version

commit d254b360c9cec4b2d82e83f18218672bf5886a18
Merge: 565e3e9 be29883
Author: Sam Kottler <shk@linux.com>
Date:   Mon Apr 28 12:45:41 2014 +0600

    Merge pull request #577 from seanknox/fix-xcode51-ruby

    Fix to support LLVM/ruby that ships with Xcode 5.1

commit be298839fa82dcbbf94ebd0032de8667d1694009
Author: Sean Knox <knoxville@gmail.com>
Date:   Thu Apr 17 13:10:08 2014 -0700

    Fix to support LLVM/ruby that ships with Xcode 5.1

commit 565e3e96a69644f5a6eb4179f559fb327c55cb87
Merge: 75c4ef6 4879624
Author: David Goodlad <david@goodlad.net>
Date:   Sun Apr 13 22:58:35 2014 +0200

    Merge pull request #572 from mroth/heartbleed

    bump version on modules (includes ruby heartbleed fix)

commit 4879624227d129c83a2835a076bc6b04a403e6ca
Author: Matthew Rothenberg <mrothenberg@gmail.com>
Date:   Fri Apr 11 17:32:19 2014 -0400

    bump version on modules (includes ruby heartbleed fix)

commit 75c4ef6bdf7c0bfb64bafca503071e674a20dd9c
Merge: a4819d6 4c7e1e3
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Tue Apr 8 12:32:04 2014 -0500

    Merge pull request #569 from tarebyte/master

    Update Puppetfile boxen-git to 2.3.0

commit 4c7e1e33acf6478ecd064eca4b41b56398baf688
Author: Mark Tareshawty <tarebyte@gmail.com>
Date:   Tue Apr 8 13:25:29 2014 -0400

    updated boxen-git to 2.3.0