Cleaner vimrc, --no-ff default merge