Update pytest addoption code to be 2.4.0 compatible (switched from optparse to argparse.)