python 2 compatibility
add 2.x and pypy to travis config
Merge branch 'python2'