@witty-crayon-22786, my travis is green, can you merge https://rbcommons.com/s/twitter/r/2979/ when you get a chance? finally nailed down all the merge issues.