Changed ingest method calls to work with the new ingest framework.
Removing dead code.
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
Getting rid of an unused field.
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
Merge pull request #573 from alexjacks92/develop

Test script now reflects new ingest framework, and has been cleaned up a bit.