Introduced suggested GitHub changes. +Added more tests.

Put an implicit fast forward into the Merge method in Repository.cs,
cleaned up usings/comments, removed GitMergeHead and made other
suggested changes from github.