Merge branch 'release-1.2.0' into develop

Author: exhuma

README README.rstREADME renamed to README.rst

@@ -37,10 +37,10 @@ Note, that when you retrieve a set of clusters, it immediately starts the
 clustering process, which is quite complex. If you intend to create clusters
 from a large dataset, consider doing that in a separate thread.
 
-For K-Means clustering it would look like this:
+For K-Means clustering it would look like this::
 
-     >>> from cluster import KMeansClustering
-     >>> cl = KMeansClustering([(1,1), (2,1), (5,3), ...])
-     >>> clusters = cl.getclusters(2)
+    >>> from cluster import KMeansClustering
+    >>> cl = KMeansClustering([(1,1), (2,1), (5,3), ...])
+    >>> clusters = cl.getclusters(2)
 
 The parameter passed to getclusters is the count of clusters generated.

setup.py

@@ -1,6 +1,6 @@
 from distutils.core import setup
 
-readme_contents = open("README").read()
+readme_contents = open("README.rst").read()
 
 # index where the first paragraph starts
 parastart = readme_contents.find('=\n') + 3
@@ -13,7 +13,7 @@
     version='1.2.0',
     author='Michel Albert',
     author_email='[email protected]',
-    url='http://python-cluster.sourceforge.net/',
+    url='https://github.com/exhuma/python-cluster',
     packages=['cluster', 'cluster.method'],
     license='LGPL',
     description=readme_contents[parastart:sentence_end],