ignore egg-info
actually return unicode in __unicode__
passing the request to the templatetags rendering to enable waffle flags, bumped version
Updated packaging.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	favorites/models.py
	favorites/templatetags/favorite_tags.py