Fixed travis file
Merge branch '1.0' into 1.1
Merge branch '1.1'
Added Sf 2.5 to Travis