run with --profile=/tmp/${USER}_profiles to run tests with profiling and dump text stats about them.
Probably best with a single test via `py.test foo/bar.py -k test_that_is_slow`
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	pytest_diffeo/__init__.py
	pytest_diffeo/args.py
cleanup stderr writes