Modify before commiting
Merge branch 'master' of github.com:jtwp470/dotemacs into appendix

Conflicts:
	inits/00-keybind.el
	inits/00-keybind.elc