travis bundler fixes from upstream