Merge remote-tracking branch 'milos_u/master'
version bump to avoid confusion

I used v1.5 in this commit: 4cf3db2ccb2e5f2b24cf5ec47f3f4a384a79f28e
but since Django 1.5 support has been merged upstream, this fork now
only includes https://github.com/jmoiron/johnny-cache/pull/13 .