update contrib
fix six decorator as pointed out by Guido