Merge branch 'pytest-2.7'

Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini

testing/python/fixture.py

@@ -622,6 +622,11 @@ class TestRequestBasic:
             *arg1*
         """)
 
+    def test_show_fixtures_color_yes(self, testdir):
+        testdir.makepyfile("def test_this(): assert 1")
+        result = testdir.runpytest('--color=yes', '--fixtures')
+        assert '\x1b[32mtmpdir' in result.stdout.str()
+
     def test_newstyle_with_request(self, testdir):
         testdir.makepyfile("""
             import pytest