Changes required by upstream renaming of nrepl.el to cider

This is an informed guess at what needs to change, but could use some testing.

Can be safely merged if working, but please hold off on publishing to Marmalade because `cider` has not yet been added there.

BTW, you might consider moving this to the `clojure-emacs` github organisation. Let me know if interested.

-Steve