Yet another go at making travis run...