Merge remote-tracking branch 'upstream/develop' into sample
Minor fixes suggested by Brian, and copyright information.
Whitespace and import clean up.
Merge branch 'sample' of github.com:alexjacks92/sleuthkit into alexjacks92-sample
Resolved merge conflicts.
Merge branch 'develop' of github.com:sleuthkit/sleuthkit into develop