Fixes old links. Fixes setup.py's long_description
Mistype
Merge pull request #16 from sudorandom/master

Fixes old links. Fixes setup.py's long_description
Fix conflict with merge