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
Change initialisation order for todochiku to better handle missing commands

Fixes #140
Disable slamhound for now, until compatible with cider
Use setq-default rather than setq to configure auto-complete defaults
When ag is available, bind M-? to ag-project globally
Use ruby-mode for .pryrc files
Use conf-mode for foreman's Procfile
Drop visual-regexp package, and use anzu's query-replace functions instead
Remove reference to defunct variable javascript-indent-level
No need to require json package explicitly
Merge remote-tracking branch 'upstream/master'

Conflicts:
	init-editing-utils.el