nrepl-turn-on-eldoc-mode => cider-turn-on-eldoc-mode (see #150)
Don't override cider repl binding for RET (fixes #150)
Merge branch 'master' into mine