ugh, sorry about the megadiff; that's whitespace. If you pull the branch and git diff it'll correctly ignore whitespace and you'll see I only changed like 5 lines.