Index: src/django_gheat/gheat/admin.py
===================================================================
--- src/django_gheat/gheat/admin.py	(revision 11313)
+++ src/django_gheat/gheat/admin.py	(revision 11406)
@@ -4,5 +4,5 @@
 class AccesspointAdmin(admin.ModelAdmin):
   list_display = ['ssid','type', 'mac', 'organization']
-  search_fields = ['ssid', 'mac', 'organization']
+  search_fields = ['ssid', 'mac', 'organization__name']
   ordering = ['ssid']
 admin.site.register(Accesspoint, AccesspointAdmin)
Index: src/django_gheat/gheat/dataimport/__init__.py
===================================================================
--- src/django_gheat/gheat/dataimport/__init__.py	(revision 11313)
+++ src/django_gheat/gheat/dataimport/__init__.py	(revision 11406)
@@ -64,11 +64,11 @@
   global organizations
   if not organizations:
-   organizations = dict(Organization.objects.all().values_list('name','id'))
+    organizations = dict(Organization.objects.all().values_list('name','id'))
   
   name = Organization.get_name_by_ssid(ssid)
-  if not name:
-    return 'NULL'
+  if not organizations.has_key(name):
+    return None
   else:
-    return int(organizations[name])
+    return str(organizations[name])
 
 
Index: src/django_gheat/httpd/maps.conf
===================================================================
--- src/django_gheat/httpd/maps.conf	(revision 11313)
+++ src/django_gheat/httpd/maps.conf	(revision 11406)
@@ -1,10 +1,9 @@
 <VirtualHost *:80>
-  ServerAdmin techniek@lijst.wirelessleiden.nl
   DocumentRoot /var/empty
-  ServerName maps.wirelessleiden.nl
-  ServerAlias a.maps.wirelessleiden.nl b.maps.wirelessleiden.nl c.maps.wirelessleiden.nl d.maps.wirelessleiden.nl e.maps.wirelessleiden.nl f.maps.wirelessleiden.nl
+  ServerName wleiden.maps.vanderzwet.net
+  ServerAlias a.wleiden.maps.vanderzwet.net b.wleiden.maps.vanderzwet.net c.wleiden.maps.vanderzwet.net d.wleiden.maps.vanderzwet.net e.wleiden.maps.vanderzwet.net f.wleiden.maps.vanderzwet.net
  
-  ErrorLog /var/log/httpd/nl.wirelessleiden.maps-error.log
-  CustomLog /var/log/httpd/nl.wirelessleiden.maps-access.log common
+  ErrorLog /var/log/httpd/net.vanderzwet.maps.wleiden-error.log
+  CustomLog /var/log/httpd/net.vanderzwet.maps.wleiden-access.log common
  
   <Directory /var/empty>
Index: src/django_gheat/httpd/osmproxy.conf
===================================================================
--- src/django_gheat/httpd/osmproxy.conf	(revision 11313)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<VirtualHost *:80>
-  ServerAdmin techniek@lijst.wirelessleiden.nl
-  DocumentRoot /var/empty
-  ServerName osmproxy.wirelessleiden.nl
-  ServerAlias a.osmproxy.wirelessleiden.nl b.osmproxy.wirelessleiden.nl c.osmproxy.wirelessleiden.nl d.osmproxy.wirelessleiden.nl e.osmproxy.wirelessleiden.nl f.osmproxy.wirelessleiden.nl
- 
-  ErrorLog /var/log/httpd/nl.wirelessleiden.osmproxy-error.log
-  CustomLog /var/log/httpd/nl.wirelessleiden.osmproxy-access.log common
- 
-  <Directory /var/empty>
-    Allow from all
-  </Directory>
-  
-  <Proxy balancer://osmcluster>
-    BalancerMember http://a.tile.openstreetmap.org:80 max=3
-    BalancerMember http://b.tile.openstreetmap.org:80 max=3
-    BalancerMember http://c.tile.openstreetmap.org:80 max=3
-  </Proxy>
-  # Example /7/63/43.png
-  <Location /osm-tile-proxy>
-    Order allow,deny
-    Allow from all
-  </Location>
-  ProxyPassMatch ^/osm-tile-proxy/(\d{1,2}/\d{1,6}/\d{1,6}\.png)$ balancer://osmcluster/$1 lbmethod=byrequests
-  CacheEnable disk /osm-tile-proxy/
-  
-  # 1 week
-  CacheDefaultExpire 604800
-  CacheRoot "/usr/local/var/httpd/cache/osmproxy"
-  CacheDirLevels 2
-  CacheDirLength 1
-  CacheMaxFileSize 1000000
-  CacheMinFileSize 1
-  CacheIgnoreCacheControl On
-  CacheIgnoreNoLastMod On
-  CacheIgnoreQueryString Off
-  CacheIgnoreHeaders None
-  CacheLastModifiedFactor 0.1
-  CacheMaxExpire 86400
-  CacheStoreNoStore On
-  CacheStorePrivate On
-  
-  
-  <Location /balancer-manager>
-    SetHandler balancer-manager
-    
-    Order Deny,Allow
-    Allow from all
-  </Location> 
-</VirtualHost>
-
-
Index: src/django_gheat/httpd/tile.conf
===================================================================
--- src/django_gheat/httpd/tile.conf	(revision 11406)
+++ src/django_gheat/httpd/tile.conf	(revision 11406)
@@ -0,0 +1,52 @@
+<VirtualHost *:80>
+  ServerAdmin info@rickvanderzwet.nl
+  DocumentRoot /var/empty
+  ServerName tile.vanderzwet.net
+  ServerAlias a.tile.vanderzwet.net b.tile.vanderzwet.net c.tile.vanderzwet.net d.tile.vanderzwet.net e.tile.vanderzwet.net f.tile.vanderzwet.net
+ 
+  ErrorLog /var/log/httpd/net.vanderzwet.tile-error.log
+  CustomLog /var/log/httpd/net.vanderzwet.tile-access.log common
+ 
+  <Directory /var/empty>
+    Allow from all
+  </Directory>
+  
+  <Proxy balancer://osmcluster>
+    BalancerMember http://a.tile.openstreetmap.org:80 max=3
+    BalancerMember http://b.tile.openstreetmap.org:80 max=3
+    BalancerMember http://c.tile.openstreetmap.org:80 max=3
+  </Proxy>
+  # Example /7/63/43.png
+  <Location /osm-tile-proxy>
+    Order allow,deny
+    Allow from all
+  </Location>
+  ProxyPassMatch ^/(\d{1,2}/\d{1,6}/\d{1,6}\.png)$ balancer://osmcluster/$1 lbmethod=byrequests
+  CacheEnable disk /
+  
+  # 1 week
+  CacheDefaultExpire 604800
+  CacheRoot "/usr/local/var/httpd/cache/tile"
+  CacheDirLevels 2
+  CacheDirLength 1
+  CacheMaxFileSize 1000000
+  CacheMinFileSize 1
+  CacheIgnoreCacheControl On
+  CacheIgnoreNoLastMod On
+  CacheIgnoreQueryString Off
+  CacheIgnoreHeaders None
+  CacheLastModifiedFactor 0.1
+  CacheMaxExpire 86400
+  CacheStoreNoStore On
+  CacheStorePrivate On
+  
+  
+  <Location /balancer-manager>
+    SetHandler balancer-manager
+    
+    Order Deny,Allow
+    Allow from all
+  </Location> 
+</VirtualHost>
+
+
Index: src/django_gheat/settings.py
===================================================================
--- src/django_gheat/settings.py	(revision 11313)
+++ src/django_gheat/settings.py	(revision 11406)
@@ -12,8 +12,8 @@
 
 DJANGO_BALANCERS = OSM_PROXY_BALANCERS = ['a','b','c','d','e','f']
-OSM_PROXY_CDN_DOMAINS = [d + '.osmproxy.wirelessleiden.nl' for d in DJANGO_BALANCERS]
+OSM_PROXY_CDN_DOMAINS = [d + '.tile.vanderzwet.net' for d in DJANGO_BALANCERS]
 OSM_PROXY_CDN_DOMAINS_PROTOCOL = 'http://'
-OSM_PREFIX = '/osm-tile-proxy'
-DJANGO_CDN_DOMAINS = [d + '.maps.wirelessleiden.nl' for d in DJANGO_BALANCERS]
+OSM_PREFIX = '/'
+DJANGO_CDN_DOMAINS = [d + '.wleiden.maps.vanderzwet.net' for d in DJANGO_BALANCERS]
 DJANGO_CDN_DOMAINS_PROTOCOL = 'http://'
 
@@ -37,5 +37,5 @@
         'NAME': 'project_heatmap',
         'USER': 'root',
-        'PASSWORD': '',
+        'PASSWORD': 'R00tj3!',
         'HOST': 'localhost',
         'PORT': '3306',
@@ -45,6 +45,6 @@
 CACHES = {
     'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '127.0.0.1:11211',
+        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+        'LOCATION': OSM_PROXY_DIR,
         'TIMEOUT': 3600 * 24 * 7,
         'OPTIONS': {
Index: src/django_gheat/urls.py
===================================================================
--- src/django_gheat/urls.py	(revision 11313)
+++ src/django_gheat/urls.py	(revision 11406)
@@ -21,15 +21,14 @@
 )
 
-urlpatterns += patterns('wlheatmap.osm_proxy',
-    url(
-        # Example : today/fire/12/3,2.png
-        regex = r'^osm-proxy/(?P<zoom>\d+)/(?P<x>\d+)[,/](?P<y>\d+).png$',
-        view = 'osm_proxy',
-        name = 'osm_proxy',
-       ),
-    )
+if settings.DEBUG:
+  urlpatterns += patterns('wlheatmap.osm_proxy',
+      url(
+          # Example : today/fire/12/3,2.png
+          regex = r'^osm-tile-proxy/(?P<zoom>\d+)/(?P<x>\d+)[,/](?P<y>\d+).png$',
+          view = 'osm_proxy',
+          name = 'osm_proxy',
+         ),
+      )
 
-
-if settings.DEBUG:
   urlpatterns += staticfiles_urlpatterns()
   urlpatterns += patterns('',