Update wheel to be universal for py2/py3
Merge pull request #2478 from danielgtaylor/universal-wheel

Update wheel to be universal for py2/py3. Fixes #2478.