Merge pull request #190 from jdufresne/pypy

Include PyPy in Travis testing