Pulling a commit from diskyer/shoestrap