fix gold data for pytest
fix tests under python 2.6
Support reporting of setup and teardown failures (marked as errors in py.test), relates to #14
Merge remote-tracking branch 'origin/master' into tests

Conflicts:
	test/nose_integration_tests/dummy_first_level_pkg_one_tests/dummy_test_a.py
	test/test-pytest.output.gold
py.test: test errors in setup and teardown, relates to #14