don't use @ in README (damn md parser)
Merge branch 'master' into express-2.x