Merge branch 'add-fugitive' into mine