Disabled Fugitive for now (to stop slow-downs).
Tidied up some things.