Scanning now finds all deleted files
Merge branch 'jake'

Conflicts:
	lib/scanner.rb