Merge branch 'master' of https://github.com/honeynet/beeswarm
Merge branch 'master' of https://github.com/honeynet/beeswarm
handle only SMTP errors
added ftp entry to default feeder config
fixed unicode errors in hive and feeder #81
Merge pull request #82 from czardoz/master

fixed unicode errors