Python 3 beta - pull master

Fixed some merge conflicts.

Tests don't pass, but I don't think they did before either.