Merge branch 'coderholic' into devel

Author: s-n-g

setup.py

@@ -23,7 +23,7 @@ def read(filename):
     name=__project__,
     version=version,
     license=__license__,
-    description=read('DESCRIPTION'),
+    description=read('DESCRIPTION').rstrip(),
     long_description=read('README.md'),
     platforms=('Any'),
     author='Ben Dowling',