customization
vim as editor
Merge remote-tracking branch 'origin'