update original pull-request to aphyr

Hi erwan,

long-time no see :)
a few commits to prep-up the PR.
a word of notice, this could actually be a nice candidate for my new riemann plugin system if you're following master as well.

a nice ulterior objective could be to leverage netty to create an async client which would take-away the blocking socket creation.

Cheers!
 - pyr