better description handling
Merge branch 'master' of github.com:seatgeek/sixpack

Conflicts:
	sixpack/templates/dashboard.html