Tests pass again, and we're properly cleaning up after ourselves
Merge branch 'master' of github.com:jkoelker/quark