stupid django 1.5
Merge branch 'master' of github.com:franklinho/drunkwithme