No more Python 2.5 on Travis :(
Merge branch '1.8' into 1.9
Update travis settings to be similar to fab's
Merge branch '1.8' into 1.9