Merge pull request libgit2#564 from libgit2/piet/update-libgit-0.24.0

Update libgit2 to 0.24.0

Merge pull request libgit2#559 from libgit2/piet/write-merge-conflict…

…ed-files

Write merge conflicted files when pulling

Merge pull request libgit2#556 from libgit2/repository-state

Add APIs to calculate and cleanup repository states

Merge pull request libgit2#535 from phatblat/ben/movehead

Expose -moveHEAD

Merge pull request libgit2#535 from phatblat/ben/movehead

Expose -moveHEAD

Merge pull request libgit2#518 from libgit2/pb/readme-edit

Remove  "in progress" from readme

Merge pull request libgit2#496 from libgit2/regret

Bump libgit2

Merge pull request libgit2#489 from libgit2/dont-email

Don't email about build status.

Merge pull request libgit2#470 from libgit2/local-commits

Better unique commit enumeration

Merge pull request libgit2#469 from libgit2/update-modulemap

Update modulemap