This is v2 of id:1376332839-22825-1-git-send-email-amdragon at mit.edu. This fixes an unintentional temporary test breakage and two typos in the last patch's commit message. There's no version diff from v1 because the final trees are the same.