Minor display fixes

<br /> was being buggy with rstrip
Merge branch 'master' of https://github.com/csvoss/carbonate

Conflicts:
	django/api/models.py