Restructure duplicate detection, add checks to dedup
Merge branch 'master' of https://github.com/akgrant43/storagemgr