Fix PEP8 and update py.test req.

PEP8 had some violations on our new stuff
py.test > 2.3 needed to support pytest functional fixtures