Fix name for ielm major mode in ac-modes list
Allow toggling of skewer-less-mode
Unbundled skewer-less into its own package
Use json-mode for json
Update init-osx-keys.el

F10 in terminal should work now.  See Issue #72
Merge pull request #135 from mlf176f2/patch-1

Update init-osx-keys.el for terminal F10
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 remote-tracking branch 'upstream/master'

Conflicts:
	init.el