Improving infrastructure by creating a Makefile and splitting requirements.
Adding badges to README.
Improving clean and vclean targets
pygit updated to 0.21.3
First steps to support merge strategies
Merge pull request #11 from jsoriano/pygit2-0.21.3

Pygit2 0.21 and merge strategies
fixing the .travis.yml
Merge pull request #9 from magmax/improve-infrastructure

Improve infrastructure
Change how to set the data of the exception MergeConflictError (using out field)