Ignore cruft from py.test
Merge branch 'release/2.0'