Add optional statsd dependency
Merge branch 'master' into phantom0.2