update setting
Merge branch 'master' of https://github.com/rencou/dotfiles