Compilation fixes for scan_exiv2
Merge branch 'master' of https://github.com/ant1/bulk_extractor into ant1-master