breaking tests, fixing tests. it puts the tests in the basket.
Merge pull request #416 from jessevondoom/master

breaking tests, fixing tests. it puts the tests in the basket.