Fix failing git spec
Fix failing error spec (bad rebase?)
Merge pull request #1075 from berkshelf/sethvargo/failing_tests

Fix failing tests