some simple linting
Fixes typo in git_merge_error

Added test to uncover the problem if it occurs again.

Resolves #114
Retries closing a pull request if it gets HTTP 422

Resolves #102.
Spec fix for syntax change in Ruby 1.9
Change in rbenv metadata file