Merge file API support
Tweaks based on feedback
Merge pull request #322 from GoBoundless/merge_file_support

Merge File API + Updates to support new libgit2 git_merge API