A lot of cleanup.
Merge branch 'master' into mergedata
Fixes case where storage isn't mounted.  Adds my submodules.
Updated analysis code from joelfred.
Updated joelfred.
Updated joeldfred analysis code.
Updated .gitignore
Started on E200_merge.  NOT WORKING!
Finished merging and saving back to NAS.  Updated code by joelfred.
Merge branch 'master' into mergedata

Conflicts:
	.gitignore