Updated changelog
Fixed sniffer params when using a custom resultserver ip for each vm (Closes #360)
Merge branch 'master' of https://github.com/cuckoobox/cuckoo