suggestions from upstream
simpler single line descriptions
Merge branch 'ernestd' into base

Conflicts:
	klaus/repo.py
	klaus/templates/repo_list.html