Add fish style syntax highlighting
Put vi back as git editor