Update for newer bundler/rake combinations