I've committed all of this work!
Merge branch 'master' of https://github.com/choldgraf/git_wont_pull