tests dir
tests in README
resolve conflict
Merge pull request #70 from sjmackenzie/master

cleaned up tests