Use system bundler for bootstrap and custom bundler for cibuild

Author: kpaulisse

.travis.yml

@@ -4,9 +4,6 @@ language: ruby
 install: true
 script: "script/cibuild"
 
-before_install:
-  - "script/travis-before-install"
-
 matrix:
   include:
     # Build with latest ruby

script/bootstrap

@@ -14,8 +14,8 @@ set +e
 echo 'Running bundler'
 cd "${DIR}" && \
   rm -f Gemfile.lock && \
-  "$DIR/script/bundle" install --without='' --no-prune --path vendor/bundle --local && \
-  "$DIR/script/bundle" binstubs puppet rake rspec-core rubocop parallel_tests && \
+  bundle install --without='' --no-prune --path vendor/bundle --local && \
+  bundle binstubs puppet rake rspec-core rubocop parallel_tests && \
   chmod 0755 bin/octocatalog-diff
 if [ $? -ne 0 ]; then
   echo 'bundle install failed - aborting bootstrap'