Add vim-niji
Revise vim-niji settings
Merge branch 'master' into mac