Doing a little cleanup in preperation for ALOT of cleanup
Merge branch 'master' of https://github.com/gl1ch/PyTools

Conflicts:
	storage-archive/storage-archive.py