Merged master.
Include .txt files (including doctests) in build.
Merge pull request #3 from mitchellrj/py3k

Python 3 support