Remove path.relative fork
jshint
Allow watch on custom events
Rebuild module-map on custom event
jshint
Handle nested overrides properly

Fixes #107
Update release notes
v2.3.3
Merge branch 'master' into amdy

Conflicts:
	lib/util/resources.js
	test/mixin.js