Fixed diff bug. Fixed some formatting...

... and accidentally changed all the line endings and things just
went south from there. Git now thinks all the lines in the file
changed and bleeeergh.