Propose solution for facet taxonomy facet showing

when it should not.
Merge branch 'master' into fixes/#133-taxonomy-facet-label-displaying-when-there-arent-any
Merge remote-tracking branch 'origin/master' into fixes/#133-taxonomy-facet-label-displaying-when-there-arent-any

Conflicts:
	website/projects/admin.py
	website/projects/models.py
Merge pull request #142 from rapidsms/fixes/#133-taxonomy-facet-label-displaying-when-there-arent-any

Propose solution for facet taxonomy facet showing