Rename requirements files and add TODO for new mock package in preparation for supporting Python 2 and Python 3