Added botnet:metrics and damballa:tor; feily:detection==feily:survey
pre commit to conflict
Merge branch 'master' of https://github.com/sjdixon/octo-wookie