Allow XBlock to run under python 3

Why are we using two different things from six to do metaclasses?