Fix change merging
Added blake2 support
Merge branch 'python2' of github.com:therealmik/pyrdiff into python2