Restore stock vim syntax behavior for function definition and add support for 'trait' and 'finally' folding
more fixes