Django 1.7 mostly working. Big refactor so probably bugs

parsers/QMs.py

@@ -2,7 +2,7 @@
 
 import csv
 from django.conf import settings
-from core.models import QM, LogbookEntry, Cave
+from troggle.core.models import QM, LogbookEntry, Cave
 from datetime import *
 from utils import save_carefully
 import re, os
@@ -87,7 +87,7 @@ def parseCaveQMs(cave,inputFile):
             continue
 
 def parse_KH_QMs(kh, inputFile):
-    """import QMs from the 1623-161 (Kaninchenh<6E>hle) html pages
+    """import QMs from the 1623-161 (Kaninchenh<6E>hle) html pages
     """
     khQMs=open(settings.EXPOWEB+inputFile,'r')
     khQMs=khQMs.readlines()