Switch to using py.test
Merge pull request #319 from pfmoore/switch_to_pytest

Switch to using py.test