Add vi temporary files to gitignore and m shortcut to git merge