Manual merge of pull request https://github.com/cliffano/bob/pull/20 .
Update notes with mocha-istanbul fix.
Bump version up to v0.5.21-pre .