Keep harmony branch up-to-date with master branch

Hi Simon,

I've just pulled newest source code from `master` branch to `harmony` branch. I also refactored some tests to reflect changes when instrumenting using `harmony` version of `istanbul`.

Please review it. Thank you.