Only use server-running-p if it is available
Load nrepl.el before clojure-mode.
Merge branch 'master' of github.com:candera/emacs

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Update clojure-mode and nrepl.el