Remove vagrant aliases
Add meld as default merge tool & setup to avoid merge commits from git pull