Added support for resetting a directory's index contents on rebuild.
Merge branch 'master' into reset_on_rebuild

Conflicts:
	codesearch.el
Merge branch 'reset_on_rebuild'