py3k xrange compatibility
Remove unittest2 unit test dependency.

Newer versions of python have a good enough builtin `unittest` module,
and unittest2 is not py3k-compatible.
py3k Queue -> queue compatibility