Committed v2
Merge branch 'master' of https://github.com/cfperez/smbanalyze

Conflicts:
	experiment.py
g
Merge branch 'master' of https://github.com/cfperez/smbanalyze

Conflicts:
	experiment.py
Revert "image.py: check for basestring instead of str"

This reverts commit 7a08e54fb03eed78ea3a2dc49c03a31e555c960b.
Revert "Don't add son_manipulator to databae automatically"

This reverts commit ef19013590e582ad0a00363647fd238807cf5364.
weird
Merge branch 'master' of https://github.com/cfperez/smbanalyze

Conflicts:
	experiment.py