Fixed font-settings for MacOSX
Merge branch 'master' of github.com:derui/dot.emacs.d

Conflicts:
	etc/skk/jisyo
	etc/skk/jisyo.bak
	etc/skk/record
	etc/skk/study