Include 3.4 and pypy in test matrix
More py3 fixes