fix py25 mention
merge
Do not use py2-only print, breaks py3 testruns
Allow parameterised fixtures to give paramemter IDs

This is just like the markers etc already can do.
merge
fix issue405 -- xfail the plugin generation test as it is not supposed to run as part of the pytest core tests and only runs on specific environments.