Hopefully, remove py31 completely
Merge py31 removal into work on #33