Various updates.. Mostly cider/emacs stuff