Fixes for Django 1.2

Hey, it would be cool if you could pull oliland's Django 1.2 fix and my non-multilingual tags fix.  Without them the app is pretty much unusable for 1.2/non-multilingual cases.