Updated django requirements and removed own fork of haystack