Updates to get python 3.3, 3.4 working