add memory_cgroup to sys.path
conntrack: config can be a list or a string, handle both
pythonize a bit
Merge branch 'hvn-fix-conntrack-config'

* hvn-fix-conntrack-config:
  pythonize a bit
  conntrack: config can be a list or a string, handle both
Merge pull request #8 from python-diamond/lacrymology/memory_docker-add-memory_cgroup-to-path

ok, looks good to me (=P) and to @kormoc and noone else is commenting, so in it goes
Merge branch 'master' of github.com:python-diamond/Diamond