use environment variable for buildpack cache directory
Merge remote-tracking branch 'heroku/master'
Update bundler to 1.3.2
Merge branch 'master' of github.com:cloudfoundry/heroku-buildpack-ruby

Conflicts:
	spec/language_pack/ruby_spec.rb