Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Updating example test configuration file to not include emailing.
Merge remote-tracking branch 'upstream/develop' into ExampleConfig
Merge pull request #648 from alexjacks92/ExampleConfig

Removed email settings from example test configuration file.