added upgrade step to 2.6
changed travis configuration