Add github's "branch" option
Merge pull request #2443 from ardavis/master

Added "branch" option to GitHub section.
move method call outside the conditional
Merge pull request #2453 from tenderlove/refactor

move method call outside the conditional
Revert "Merge pull request #2453 from tenderlove/refactor"

This reverts commit afc5660e0cc6fba638d93ffac70b986ba1894fb6, reversing
changes made to e97ace7214f3fa42a20294081c86d28a3f614a4d.
don't explode if Thor raises
heeyyy list CAN do exit status
thor thor thor
set gitconfig, hopefully fixing travis
Merge branch '1-3-stable'

Conflicts:
	Rakefile
	spec/bundler/gem_helper_spec.rb
Update references to the site repo.

The bundler-site-middleman repo has been merged into bundler-site and
no longer exists.
Merge pull request #2498 from TimMoore/update-site-repo

Update references to the site repo.
Update references to the repository URL.

The repository has moved from the carlhuda account to the bundler
organization.
Merge pull request #2500 from TimMoore/carlhuda-to-bundler

Update references to the repository URL.
trailing whitespace is how this works
Set --no-cache when bundle install --local is called.
Merge branch '1-3-stable'
Merge branch '1-3-stable'
don't give forks our emails
Merge pull request #2509 from TimMoore/2494-local-implies-no-cache

Set --no-cache when bundle install --local is called.