made py3k compatible
updated url information in setup.py
Merge remote-tracking branch 'github/master'