merge from upstream
Merge remote-tracking branch 'upstream/master' into merge-from-upstream

* upstream/master:
  Move report-writing to the end.
remove redundant generalOptions
update unique istanbul dependencies
Merge branch 'merge-from-upstream' into update-dependencies

* merge-from-upstream:
  remove redundant generalOptions
  merge from upstream
  Move report-writing to the end.
Merge pull request #5 from oddbird/update-dependencies

Merge from upstream and update dependencies