Download zip, take two

Hey, looks like the previous merge for this branch wasn't a normal git merge, but rather all the changes from the branch compressed to a single commit.  Try merging this one.  It should go a lot more smoothly.