Added fugitive plugin
Fixed some merging conflicts