change gitconfig to not keep temporary files on merge tool
added .vagrant to global git ignore