Py33

Hey there,

I've fixed up a lot of stuff and everything builds and passes all the unit tests.

Thanks
Thomas <ovangle@gmail.com>