..
Merge branch 'master' of github.com:minorblend/emacs.d

* 'master' of github.com:minorblend/emacs.d:
  changed key-bindings

Conflicts:
	josh-keys.el