Fixes indentation
Automatically removes git merge backups
Uses vim in the terminal for git