Merge branch 'master' of github.com:ryotarai/dotfiles
Add nffmerge alias.
Merge branch 'master' of github.com:ryotarai/dotfiles