Refactor tests to use pytest.

Fixes to make sure suite runs on python 2.6 without pandas or scipy
Fix merge conflict
Merge pull request #37 from ChrisBeaumont/test_cleanup

Test refactor