Deleted tree
Merge branch 'master' into dev
zlib1g-dev is needed to compile lxml

On Debian Jessie the zlib1g-dev package was needed to compile lxml during the pip install. It seems this might affect Ubuntu 10.04+ too (http://stackoverflow.com/a/17378157/862188)
Merge pull request #4 from zertrin/fix-readme-1

Fix README: zlib1g-dev is needed to compile lxml
Fixed readme to install feed reqs. by default
Merge branch 'master' into dev
Malcom feeds with celery
Merge pull request #5 from penpyt/dev

Malcom feeds with celery
Features & Bugfixes

Features:
- Can now download raw payload in flow

Bugfix:
- Dates were being displayed incorrectly
- Too many fields were being displayed in graph view
Bugfixes

Analytics would launch multiple threads on same element
Toolbox
- Google's resolver filtered requests to malicious domains
- DIG: ANY != A + NS + MX + CNAME
- Improved regex
- Set display fields for sniffer view
Feature - sniffer status
Feature: TLS interception
KEYS readme fix
Screenshot in README
Performance optimization
TLS proxy bugfix

TLS proxy factory is now generic for the whole Malcom process
Analytics runs every 10 seconds
Webserver refactoring

Removed some functions which have gone to analytics.
Changed methods for some /neighbors, now using GET instead of POST, and
_id's as parameters
Display bugfix
Bugfix: only first element shown in node view