Updates for django 1.6

Fixed #149