Added support for PyPy
Merge branch 'master' of github.com:timsavage/odin
Updated tox config to get tests working with pypy
Enabled development branch with travis-ci
Merge branch 'master' into development
Merge branch 'master' into development