Making sniffing configurable in ES. Fixes #388.
Merge branch 'master' of github.com:thinkaurelius/titan