Fixed last failing test in 2.6, fixed travis to support 2.5