Django 1.6 compatibility

You were really close to getting tests to pass in 1.6.  Just a few small tweaks to make it all green, and a new test for sqlite savepoint compatibility.