Ok this is really the first commit.
Merge branch 'master' of github.com:jacksonloper/diskover

Conflicts:
	diskover/directory.py