Hack around failing integration tests?

Will let travis ci see if this works.
Merge pull request #15 from jmchilton/test_improvements

Hack around failing integration tests?