Bring this branch up to date.

No idea why so many files have changed, but I'm recording my current
progress in this branch anyway.  Just in case.  It's probably safe to
delete this branch, considering the progress rch has made w.r.t.
Istanbul integration.
Merge branch 'istanbul-integration-wip-2' of github.com:sam-falvo/whiskey into istanbul-integration-wip-2

Conflicts:
	lib/coverage.js
	lib/run.js
	package.json