trail spaces
Merge remote-tracking branch 'origin/master'
add migemo and somefixes