Updated for v1.0.7
updated for newer pytest version
updated to reflect v1.0.7
updated to reflect removal of python2.6