Dev alex

@txels:

Once this has been merged, I'll release the 1.0 version, which will close off #58.

This gets all the tests passing on py3k and py2.6