move clojure-mode back to clojure-emacs organisation version
update cider
Merge remote-tracking branch 'upstream/master'