Update setup.py, version number.
Add __getitem__ to fixup with master.
Resolve merge.