Include watched path in fs.watch raw event
Merge branch 'master' into vimsafe

* master:
  Include watched path in fs.watch raw event

Conflicts:
	index.js