Correct title
Merge branch 'master' of github.com:MGalganek/pytest_vs_nose