Threshold for not scanning is now based on file size (default 2Meg)
Merge remote-tracking branch 'origin/master'
minor cleanup