Revert to mostly working travis