missing import, force_unicode on description
Merge branch 'master' into base

Conflicts:
	klaus/repo.py
html/css junk
cleanup be less picky for file searching