Add rbenv/bundler support. Fix minor Rakefile issue