update bundler and rake
apparently bundler can't find bundler 1.6.0...
Merge pull request #22 from theckman/update_deps

update bundler and rake