Add vim-numbers
Change gitconfig merge and push strategies