This obsoletes
id:1439746876-23654-1-git-send-email-david at tethera.net
The main change is to split the creation of the protocol array into
two steps, the first in patch 2/8, so that (hopefully) it builds after
every patch in the series. I also fixed a few small whitespace issue,
and added the first optional dependency in the debian packaging.