Merge pull request #233 from hynek/pytest

Use py.test test runner