update my-key-map
Merge branch 'master' of github.com:nhoffman/.emacs.d
Merge branch 'master' of github.com:nhoffman/.emacs.d

Conflicts:
	init.el
	init.org