Corrected link references.
Corrected test for Pypi; can't introspect dict(), so use UserDict() instead.