Issue #2000 Add test for conflict markers in Gemfile.lock
Raise error if Gemfile.lock contains conflict markers, closes #2000
Issue #2000 improve error message
rake:release should guard against both uncommitted and unstaged changes
support setting boolean environment variables

These were previously stored as a string if they are derived from the
environment or configuration files. Rather than altering each of the checks,
we can select a list of settings to convert to boolean values when they are
accessed.
Issue #2000 Improve test for conflict markers in lockfile
Merge remote-tracking branch 'upstream/master' into issue-2000
change to new expect syntax for rspec
Fix loading of gemspecs that contain unicode characters.

If Ruby's default encoding is not changed then the files are read in as
US-ASCII. When compared against the regular expression they were raising
encoding errors on 1.9 because the unicode characters could not be
converted to ASCII.

This changes the YAML header to check to match what is currently in 1.3
which doesn't have the problem (as it doesn't need to process the whole
string).
Merge pull request #2301 from gaffneyc/fix-unicode-gemspecs

Fix loading of gemspecs that contain unicode characters.
indentation
Accepts strings for group names. Fixes #2305

This allow Environment#setup behaves in same way as
Environment#require, allowing usage of ENV variables directly:

  require "bundler"
  Bundler.setup(:default, ENV.fetch("RACK_ENV", "development"))
campfire build notification
Fix conflict resolution optimization
refactor gem fetching
bundler is always unmet, soooo yeah
oh my zomg, don't get full indexes for api sources
try to replicate Fetcher.enable_endpoint = false
umm wiping out the specs we downloaded: bad
fixup refactor fetching