Merge pull request #8 from jhartman/master

Fixing the zoie trimming test
Version 3.3.14
Fixing all broken tests. In some cases, timeouts were not correct. In another, I placed a weird hack for when our ref counting seems to be incorrect