Updated setup.py to add Python 3 tag.
Fixed merge conflict on setup.py