Merge pull request #160 from Smoss/master

Mac test fix
Merge http://www.github.com/sleuthkit/sleuthkit