This passes the tests.

- Added django-annoying
- All the current tests in test_models.py are passing
Merge remote-tracking branch 'origin/master' into lc/models-and-tests
Merge pull request #4 from wehaveweneed/lc/models-and-tests

This passes the tests.