django 1.6 session problem (improvement)

This seems like a more 'correct' way to go than #508