Mainly typos.
Merge branch 'master' of github.com:hirokitakahashi/.emacs

Conflicts:
	my.el