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

Conflicts:
	mode-mappings.el