Rebasing my failed Travis commits together to hide my shame

[skip ci]