Merge http://www.github.com/sleuthkit/autopsy
Merge http://www.github.com/sleuthkit/autopsy
Merge http://www.github.com/sleuthkit/autopsy
Merge http://www.github.com/sleuthkit/autopsy
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Minor Test Additions and fixes
Updated regression.py and documentation
updated regression test and documentation
Merge remote-tracking branch 'upstream/master'
Regression test improvements, now uses zip format
updates to regression testing
changed regression test file structure
Merge http://www.github.com/sleuthkit/autopsy
fixed regression.py
Merge branch 'master' of https://github.com/Smoss/autopsy
Merge branch 'master' of https://github.com/Smoss/autopsy

Conflicts:
	Testing/script/regression.py
Merge branch 'master' of https://github.com/Smoss/autopsy

Conflicts:
	Testing/script/regression.py
Had to roll back a lot of commits, mostly related to fixing the file hierarchy.
fixed some things, and rolled back a lot of comments.