Move zephyr/static to just static.

It's not really a part of the server (aka the rest of zephyr/).

(imported from commit 27f6b6b064938ad927075a68d873e4b68710d279)

assets/README

@@ -1,3 +1,3 @@
 This directory contains e.g. the editable originals for image files.
 
-The exported files we serve are checked in under zephyr/static.
+The exported files we serve are checked in under static/.

assets/favicon/generate

@@ -20,5 +20,5 @@ for i in xrange(1,100):
 
     # Convert to PNG
     subprocess.check_call(['inkscape', '--without-gui', '--export-area-page',
-        '--export-png=../../zephyr/static/images/favicon/favicon-%d.png' % (i,),
+        '--export-png=../../static/images/favicon/favicon-%d.png' % (i,),
         'tmp.svg'])

humbug/settings.py

@@ -245,6 +245,7 @@ else:
     else:
         STATIC_ROOT = 'prod-static/serve'
 
+STATICFILES_DIRS = ['static/']
 STATIC_HEADER_FILE = 'zephyr/static_header.txt'
 
 # To use minified files in dev, set PIPELINE = True.  For the full

humbug/urls.py

@@ -200,7 +200,7 @@ urlpatterns += patterns('',
 if not settings.DEPLOYED:
     use_prod_static = getattr(settings, 'PIPELINE', False)
     static_root = os.path.join(settings.DEPLOY_ROOT,
-        'prod-static/serve' if use_prod_static else 'zephyr/static')
+        'prod-static/serve' if use_prod_static else 'static')
 
     urlpatterns += patterns('',
         url(r'^static/(?P<path>.*)$', 'django.views.static.serve',