Add test-venv to .gitignore
Fixes #161: Ensure unique field appears in create / edit forms
Merge pull request #162 from lmorchard/161-missing-unique-checkbox

Fixes #161: Ensure unique field appears in create / edit forms
Update doco to point at mozilla repos
Fix #163 - Don't create multiple DeferredAwards for unique badges.
Merge pull request #164 from rlr/detect-deferred-award-dupes

Fix #163 - Don't create multiple DeferredAwards for unique badges.
Fix #165 - Only send email on first DeferredAward to user.
Merge pull request #166 from rlr/only-one-deferred-email

Fix #165 - Only send email on first DeferredAward to user.
Increase test verbosity on travis
Include nomination in award detail when necessary
Merge pull request #167 from lmorchard/include-nomination-in-award-detail

Include nomination in award detail when necessary
Fix on_badge_award in badger_example
Update badges_list and awards_list(support Django 1.5)
Fix extra spaces
Fix django-badger/issues url
PEP8
Remove direct_to_template
Fix kwargs.get problem (kwargs -> self.kwargs)
Improve AwardsListView
Improve BadgesListView
Add configurable user models
Merge branch 'feature/django1.5' of github.com:ToxicWar/django-badger into feature/django1.5

Conflicts:
	README.rst
	badger/models.py