Update bundler and fix mocha dependency
Merge pull request #502 from josevalim/bundler

Update bundler and fix mocha dependency