Fixes form master, Unathi<->Soghun removal, dionaea changes, lots of say refactoring.

See commit logged.