Git: Remove unused diffmerge man page
Prezto: Update prezto
Merge branch 'master' into oucs