upgrade cider-nrepl
reorg, clean up, unify code