Fixed 2.6 compat and added it to Travis config