Make pathwatcher calls go through files.js

Conflicts:
	tools/files.js
	tools/safe-pathwatcher.js