Merge tests from branch 'multiple-futures-fix' of https://github.com/Mekk/python-modernize into HEAD

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Additions to .gitignore (from Mekk's branch).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>