More tidying
Merge branch 'master' of github.com:mgravell/capnproto-net