adding fugitive and better delimitMate settings
fixing merge conflict