Fix signature of six.with_metaclass.
Merge pull request #54 from carljm/six-1.4-compat

Fix signature of six.with_metaclass.