Revert "mpdclient: Never time out"

This reverts commit 8951e5f332985db3967357ca5a80d2178e2ce244.
Pseudo-modularize ZNC support