Fix bad merge
Update timestamp
Merge pull request #54 from dottedmag/rspamd-0.6

Last-minute fixes