Fix to Sphinx branch.  Also added a nice gitdiff.  Do a google on the code for gldiff.pl. gldiff.pl allows one to more easily compare gitdiff's
http://stackoverflow.com/questions/3338126/git-how-to-diff-the-same-file-between-two-different-commits-on-the-same-branch