Merge pull request #161 from Smoss/master

Fixed testing on mac
Updated build-unix to be more similar to the Autopsy one
Merge remote-tracking branch 'upstream/master'