don't save git  merge backups
add git-gutter vim plugin
Merge remote-tracking branch 'origin/master'