ENH: py.test

Moving us toward py.test use

Closes #655.
Just curious: was this required for py.test?