Update for compatibility with cider (formerly nrepl)
A more concise default initial-scratch-message
Remove *is-cocoa-emacs* constant
cider-interaction-mode is now cider-mode
Don't diminish subword-mode except in latest Emacs

Closes #138
Merge branch 'master' of https://github.com/purcell/emacs.d
c