On Tue, Apr 15, 2014 at 11:23:34AM -0700, W. Trevor King wrote:
> I think I've fixed the stuff you pointed out.  I'll report back after
> testing the rebased version locally.

Fixed a typo in testing, and just pushed 660ae28.  I think this is
good to go now.