Merge.py3k

Combined Python 3 patches from PyCon 2014 sprints. 

In Progress