almost ready for issue #1, can upload to testpypi however pip install fails

Makefile

@@ -1,8 +1,9 @@
 # Makefile for testing
 
 TESTS = git svn crlf strange
+TESTPYPI = http://testpypi.python.org/pypi
 
-.PHONY: dogfood test $(TESTS) clean sdist
+.PHONY: dogfood test $(TESTS) clean dist
 
 dogfood:
 	src/cdiff.py -s
@@ -20,9 +21,15 @@ $(TESTS):
 	python3 src/cdiff.py tests/$@.diff | diff -u tests/$@.diff -
 
 clean:
-	rm -rf build/ cdiff.egg-info/ dist/
+	rm -rf MANIFEST build/ cdiff.egg-info/ dist/
 
-sdist:
-	./setup.py sdist
+dist-test:
+	./setup.py build sdist upload -r $(TESTPYPI)
+
+install-test:
+	pip install -r $(TESTPYPI)
+
+dist:
+	./setup.py build sdist upload
 
 # vim:set noet ts=8 sw=8:

README.rst

@@ -6,9 +6,12 @@ with **auto pager**.  Requires python (>= 2.5.0) and ``less``.
 
 .. image:: http://ymattw.github.com/cdiff/img/default.png
    :alt: default
+   :align: center
 
 .. image:: http://ymattw.github.com/cdiff/img/side-by-side.png
    :alt: side by side
+   :align: center
+   :width: 900 px
 
 Installation
 ------------

setup.py

@@ -12,10 +12,10 @@ setup(
     author = 'Matthew Wang',
     author_email = 'mattwyl@gmail.com',
     license = 'BSD-3',
-    description = ('View incremental, colored diff in unified format or side '
+    description = ('View colored, incremental diff in unified format or side '
                    'by side with auto pager'),
     long_description = long_description,
-    keywords = 'incremental colored side-by-side diff',
+    keywords = 'colored incremental side-by-side diff',
     url = 'https://github.com/ymattw/cdiff',
     classifiers = [
         'Development Status :: 3 - Alpha',

src/cdiff.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-View incremental, colored diff in unified format or in side by side mode with
+View colored, incremental diff in unified format or in side by side mode with
 auto pager.  Requires Python (>= 2.5.0) and less.
 
 See demo at homepage: https://github.com/ymattw/cdiff
@@ -516,7 +516,7 @@ def main():
     supported_vcs = [check[0] for check, _ in REVISION_CONTROL]
 
     usage = '%s [options] [diff]' % os.path.basename(sys.argv[0])
-    description= ('View incremental, colored diff in unified format or '
+    description= ('View colored, incremental diff in unified format or '
                   'side by side with auto pager.  Read diff from diff '
                   '(patch) file if given, or stdin if redirected, or '
                   'diff produced by revision tool if in a %s workspace') \