Better note about no pull requests.
sort of working again
Merge branch 'master' into devel
some refactoring of diff hunk reading code