Fix hooks
Update git hooks and version script
Merge version.ric