Lots o' tests\!
Merge branch 'master' of http://github.com/TheRainbowUnicornMan/test_git2 into test-branch