jshint option added
jshint options added
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/dirco.js