More changes to try and get things to pass tests. Also adding bundler as well as rubygems-bundler.