Issue/916/django1.6

Travis fails with a deprecation warning for simplejson used by sorl-thumbnail, but otherwise test are passing