Merge. Hopefully travis will work better now.