Update travis to run against 2.0 and 2.1