Pull in ka-lite:develop, including Django 1.5 changes

Doing a PR instead of a direct merge to develop, as this includes changes to the central server code for Django 1.5.

Let's see how the tests run!