stuff
Merge branch 'develop' of https://github.com/kevgliss/analys into develop

Conflicts:
	analys/common/mime.py