Merge branch 'master' of https://github.com/rikita/settings
Add some settings for vim.