mock==1.0.1
pytest==3.0.4 # Updated from 3.0.2

mock==2.0.0
pytest==3.0.4 # Updated from 3.0.2

Revert "see if downgrading mock from 2.0.0 to 1.0.1 fixes travis"
Revert "see if downgrading mock from 2.0.0 to 1.0.1 fixes travis"

This reverts commit f9f204c12a747aefa459edd120d3a9a63f675a60.
