Clean up
Reimplement tests using py.test
Bump version to 0.1.1