wip
Merge branch 'wip' of github.com:cider/go-cider into wip