* fixing lots of remaining 3k compatibility issues, mostly with py.test itself.
* fixing lots of remaining 3k compatibility issues, mostly with py.test itself.

* removing very old import-tests that IIRC relate to a time when there
  was a custom import hook in use.

* basically py.test internal tests pass now except py3/py2 distributed
  testing tests

bryan-lunt/execnet