aaa
started doing context
iaiuoei:wq
Merge branch 'master' into aaa

Conflicts:
	morphology/kanto2kansai.py
	morphology/kantokansai_dic.py
kansaiben trans, now context considered