Some cleanups
Merge branch 'master' of https://github.com/bricetebbs/dj_extras