Upgrade to pathwatcher@2.0
Prepare 1.0.0 release
Merge branch 'master' into chrome35

Conflicts:
	package.json
1.1.0 (0.49.0)
Merge pull request #61 from atom/chrome35

Upgrade to nan@1.2.0