Updated abook config to the patch applied.
Don't launch ycm when typing git commits with vim.
Added a git alias : mg = merge -S