diff --git a/.gitignore b/.gitignore
index dfdf4352..b56fe5a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ tmp/*
 *~
 *.mo
 .virtualenv
+/static/
diff --git a/media/css/main/main.css b/airmozilla/base/static/css/main.css
similarity index 100%
rename from media/css/main/main.css
rename to airmozilla/base/static/css/main.css
diff --git a/media/img/logo-airmo-lg.png b/airmozilla/base/static/img/logo-airmo-lg.png
similarity index 100%
rename from media/img/logo-airmo-lg.png
rename to airmozilla/base/static/img/logo-airmo-lg.png
diff --git a/media/js/main/libs/jquery-1.4.4.min.js b/airmozilla/base/static/js/libs/jquery-1.4.4.min.js
similarity index 100%
rename from media/js/main/libs/jquery-1.4.4.min.js
rename to airmozilla/base/static/js/libs/jquery-1.4.4.min.js
diff --git a/media/js/main/libs/jquery-1.7.2.min.js b/airmozilla/base/static/js/libs/jquery-1.7.2.min.js
similarity index 100%
rename from media/js/main/libs/jquery-1.7.2.min.js
rename to airmozilla/base/static/js/libs/jquery-1.7.2.min.js
diff --git a/airmozilla/base/templates/main_base.html b/airmozilla/base/templates/main_base.html
index 9b2b495e..b59a08a3 100644
--- a/airmozilla/base/templates/main_base.html
+++ b/airmozilla/base/templates/main_base.html
@@ -1,19 +1,22 @@
 <!DOCTYPE html>
-<html LANG="{{ LANG }}" dir="{{ DIR }}">
+<html lang="{{ LANG }}" dir="{{ DIR }}">
   <head>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
     <title>{% block page_title %}Air Mozilla{% endblock %}</title>
-
+    
     {% block site_css %}
-      {{ css('main_css') }}
+      {% compress css %}
+      <link href="{{ static('css/main.css')}}" rel="stylesheet" type="text/css">
+      {% endcompress %}
     {% endblock %}
   </head>
   <body>
     {% block content %}{% endblock %}
 
     {% block site_js %}
-      {{ js('main_js') }}
+      {% compress js %}
+      <script src="{{ static('js/libs/jquery-1.7.2.min.js') }}"></script>
+      {% endcompress %}
     {% endblock %}
   </body>
 </html>
-
diff --git a/airmozilla/main/templates/main/home.html b/airmozilla/main/templates/main/home.html
index 8a70ef55..3224eda7 100644
--- a/airmozilla/main/templates/main/home.html
+++ b/airmozilla/main/templates/main/home.html
@@ -6,11 +6,12 @@
 </h1>
 
 {% if request.user.is_active %}
+
     <p>{{ _('You are logged in as {username}')|f(username=request.user) }}.
     <a href="{{ url('auth.logout') }}">{{ _('Log out') }}</a></p>
 {% else %}
     <p><a id="browserid" href="#">{{ _('Log in with BrowserID') }}</a></p>
-    <form method="POST" action="{{ url('auth.mozilla_browserid_verify') }}">
+    <form method="post" action="{{ url('auth.mozilla_browserid_verify') }}">
         {{ csrf() }}
         {{ browserid_form.as_p() }}
     </form>
@@ -18,7 +19,7 @@
 {% endblock %}
 
 {% block site_js %}
-    {{ js('main_js') }}
+    {{ super() }}
     {% if not request.user.is_active %}
         {{ browserid_form.media }}
     {% endif %}
diff --git a/media/css/manage/bootstrap.min.css b/airmozilla/manage/static/manage/css/bootstrap.min.css
similarity index 100%
rename from media/css/manage/bootstrap.min.css
rename to airmozilla/manage/static/manage/css/bootstrap.min.css
diff --git a/media/css/manage/manage.css b/airmozilla/manage/static/manage/css/manage.css
similarity index 53%
rename from media/css/manage/manage.css
rename to airmozilla/manage/static/manage/css/manage.css
index f777c0d7..403a07e7 100644
--- a/media/css/manage/manage.css
+++ b/airmozilla/manage/static/manage/css/manage.css
@@ -1,4 +1,6 @@
-[class^="icon-"] {background-image: url("/media/img/manage/glyphicons-halflings.png")}
+[class^="icon-"] {
+    background-image: url("../img/glyphicons-halflings.png");
+}
 
 body {
     padding-top: 15px;
diff --git a/media/img/manage/glyphicons-halflings-white.png b/airmozilla/manage/static/manage/img/glyphicons-halflings-white.png
similarity index 100%
rename from media/img/manage/glyphicons-halflings-white.png
rename to airmozilla/manage/static/manage/img/glyphicons-halflings-white.png
diff --git a/media/img/manage/glyphicons-halflings.png b/airmozilla/manage/static/manage/img/glyphicons-halflings.png
similarity index 100%
rename from media/img/manage/glyphicons-halflings.png
rename to airmozilla/manage/static/manage/img/glyphicons-halflings.png
diff --git a/media/js/manage/bootstrap.min.js b/airmozilla/manage/static/manage/js/bootstrap.min.js
similarity index 100%
rename from media/js/manage/bootstrap.min.js
rename to airmozilla/manage/static/manage/js/bootstrap.min.js
diff --git a/airmozilla/manage/templates/_form_buttons.html b/airmozilla/manage/templates/manage/_form_buttons.html
similarity index 100%
rename from airmozilla/manage/templates/_form_buttons.html
rename to airmozilla/manage/templates/manage/_form_buttons.html
diff --git a/airmozilla/manage/templates/event_edit.html b/airmozilla/manage/templates/manage/event_edit.html
similarity index 100%
rename from airmozilla/manage/templates/event_edit.html
rename to airmozilla/manage/templates/manage/event_edit.html
diff --git a/airmozilla/manage/templates/event_request.html b/airmozilla/manage/templates/manage/event_request.html
similarity index 100%
rename from airmozilla/manage/templates/event_request.html
rename to airmozilla/manage/templates/manage/event_request.html
diff --git a/airmozilla/manage/templates/group_edit.html b/airmozilla/manage/templates/manage/group_edit.html
similarity index 100%
rename from airmozilla/manage/templates/group_edit.html
rename to airmozilla/manage/templates/manage/group_edit.html
diff --git a/airmozilla/manage/templates/group_new.html b/airmozilla/manage/templates/manage/group_new.html
similarity index 100%
rename from airmozilla/manage/templates/group_new.html
rename to airmozilla/manage/templates/manage/group_new.html
diff --git a/airmozilla/manage/templates/groups.html b/airmozilla/manage/templates/manage/groups.html
similarity index 100%
rename from airmozilla/manage/templates/groups.html
rename to airmozilla/manage/templates/manage/groups.html
diff --git a/airmozilla/manage/templates/home.html b/airmozilla/manage/templates/manage/home.html
similarity index 86%
rename from airmozilla/manage/templates/home.html
rename to airmozilla/manage/templates/manage/home.html
index 85a3daf7..f58ca5f8 100644
--- a/airmozilla/manage/templates/home.html
+++ b/airmozilla/manage/templates/manage/home.html
@@ -1,4 +1,4 @@
-{% extends "manage_base.html" %}
+{% extends "manage/manage_base.html" %}
 {% set page = "home" %}
 
 {% block manage_title %}
diff --git a/airmozilla/manage/templates/manage_base.html b/airmozilla/manage/templates/manage/manage_base.html
similarity index 81%
rename from airmozilla/manage/templates/manage_base.html
rename to airmozilla/manage/templates/manage/manage_base.html
index 0e551828..0149b3a3 100644
--- a/airmozilla/manage/templates/manage_base.html
+++ b/airmozilla/manage/templates/manage/manage_base.html
@@ -25,14 +25,17 @@
     <title>{% block page_title %}Air Mozilla Management{% endblock %}</title>
 
     {% block site_css %}
-      {{ css('manage_css') }}
+      {% compress css %}
+      <link href="{{ static('manage/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css">
+      <link href="{{ static('manage/css/manage.css') }}" rel="stylesheet" type="text/css">
+      {% endcompress %}
     {% endblock %}
   </head>
   <body>
     <div class="container-fluid">
     <div class="row">
         <div class="span12" id="logo">
-            <img id="logo-img" src="{{ MEDIA_URL }}img/logo-airmo-lg.png" alt="Air Mozilla">
+            <img id="logo-img" src="{{ static('img/logo-airmo-lg.png') }}" alt="Air Mozilla">
        		<div class="row">
             <div id="menu" class="span3">
                 <ul class="nav nav-list">
@@ -61,8 +64,9 @@
 	</div>
     </div>
     {% block site_js %}
-      {{ js('main_js') }}
+      {% compress js %}
+      <script src="{{ static('js/libs/jquery-1.7.2.min.js') }}"></script>
+      {% endcompress %}
     {% endblock %}
   </body>
 </html>
-
diff --git a/airmozilla/manage/templates/participant_edit.html b/airmozilla/manage/templates/manage/participant_edit.html
similarity index 100%
rename from airmozilla/manage/templates/participant_edit.html
rename to airmozilla/manage/templates/manage/participant_edit.html
diff --git a/airmozilla/manage/templates/user_edit.html b/airmozilla/manage/templates/manage/user_edit.html
similarity index 100%
rename from airmozilla/manage/templates/user_edit.html
rename to airmozilla/manage/templates/manage/user_edit.html
diff --git a/airmozilla/manage/templates/users.html b/airmozilla/manage/templates/manage/users.html
similarity index 100%
rename from airmozilla/manage/templates/users.html
rename to airmozilla/manage/templates/manage/users.html
diff --git a/airmozilla/manage/views.py b/airmozilla/manage/views.py
index 631d007e..79510c19 100644
--- a/airmozilla/manage/views.py
+++ b/airmozilla/manage/views.py
@@ -12,7 +12,7 @@ staff_required = user_passes_test(lambda u: u.is_staff)
 @staff_required
 def home(request):
     """Management homepage / explanation page."""
-    return render(request, 'home.html')
+    return render(request, 'manage/home.html')
 
 
 @staff_required
@@ -35,7 +35,7 @@ def users(request):
         users_paged = paginator.page(1)
     except EmptyPage:
         users_paged = paginator.page(paginator.num_pages)
-    return render(request, 'users.html', {'users': users_paged, 'form': form})
+    return render(request, 'manage/users.html', {'users': users_paged, 'form': form})
 
 
 @staff_required
@@ -50,7 +50,7 @@ def user_edit(request, id):
             return redirect('manage.users')
     else:
         form = UserEditForm(instance=user)
-    return render(request, 'user_edit.html', {'form': form, 'u': user})
+    return render(request, 'manage/user_edit.html', {'form': form, 'u': user})
 
 
 @staff_required
@@ -58,7 +58,7 @@ def user_edit(request, id):
 def groups(request):
     """Group editor: view groups and change group permissions."""
     groups = Group.objects.all()
-    return render(request, 'groups.html', {'groups': groups})
+    return render(request, 'manage/groups.html', {'groups': groups})
 
 
 @staff_required
@@ -73,7 +73,7 @@ def group_edit(request, id):
             return redirect('manage.groups')
     else:
         form = GroupEditForm(instance=group)
-    return render(request, 'group_edit.html', {'form': form, 'g': group})
+    return render(request, 'manage/group_edit.html', {'form': form, 'g': group})
 
 
 @staff_required
@@ -88,25 +88,25 @@ def group_new(request):
             return redirect('manage.groups')
     else:
         form = GroupEditForm(instance=group)
-    return render(request, 'group_new.html', {'form': form})
+    return render(request, 'manage/group_new.html', {'form': form})
 
 
 @staff_required
 @permission_required('manage.event_request')
 def event_request(request):
     """Event request page:  create new events to be published."""
-    return render(request, 'event_request.html')
+    return render(request, 'manage/event_request.html')
 
 
 @staff_required
 @permission_required('manage.participant_edit')
 def participant_edit(request):
     """Participant editor page:  update biographical info."""
-    return render(request, 'participant_edit.html')
+    return render(request, 'manage/participant_edit.html')
 
 
 @staff_required
 @permission_required('manage.produce_events')
 def event_edit(request):
     """Event edit/production:  change, approve, publish events."""
-    return render(request, 'event_edit.html')
+    return render(request, 'manage/event_edit.html')
diff --git a/airmozilla/settings/base.py b/airmozilla/settings/base.py
index b215ba74..52694266 100644
--- a/airmozilla/settings/base.py
+++ b/airmozilla/settings/base.py
@@ -9,25 +9,6 @@ from funfactory.settings_base import *
 # clone.
 PROJECT_MODULE = 'airmozilla'
 
-# Bundles is a dictionary of two dictionaries, css and js, which list css files
-# and js files that can be bundled together by the minify app.
-MINIFY_BUNDLES = {
-    'css': {
-        'main_css': (
-            'css/main/main.css',
-        ),
-        'manage_css': (
-            'css/manage/bootstrap.min.css',
-            'css/manage/manage.css',
-        )
-    },
-    'js': {
-        'main_js': (
-            'js/main/libs/jquery-1.7.2.min.js',
-            'js/main/libs/jquery.cookie.js',
-        ),
-    }
-}
 
 # Defines the views served for root URLs.
 ROOT_URLCONF = '%s.urls' % PROJECT_MODULE
diff --git a/airmozilla/settings/local.py-dist b/airmozilla/settings/local.py-dist
index 9674a486..3627f0ef 100644
--- a/airmozilla/settings/local.py-dist
+++ b/airmozilla/settings/local.py-dist
@@ -38,15 +38,19 @@ MANAGERS = ADMINS
 
 # Debugging displays nice error messages, but leaks memory. Set this to False
 # on all server instances and True only for development.
-DEBUG = TEMPLATE_DEBUG = True
+#DEBUG = TEMPLATE_DEBUG = True
 
 # Is this a development instance? Set this to True on development/master
 # instances and False on stage/prod.
-DEV = True
+#DEV = True
+
+# If you intend to run on something like http://127.0.0.1:8000 then
+# set this False so cookies can be set with HTTP
+#SESSION_COOKIE_SECURE = False
 
 # By default, BrowserID expects your app to use http://127.0.0.1:8000
 # Uncomment the following line if you prefer to access your app via localhost
-# SITE_URL = 'http://localhost:8000'
+#SITE_URL = 'http://localhost:8000'
 
 # Playdoh ships with Bcrypt+HMAC by default because it's the most secure.
 # To use bcrypt, fill in a secret HMAC key. It cannot be blank.
diff --git a/airmozilla/urls.py b/airmozilla/urls.py
index 8c87e85f..5183f9d9 100644
--- a/airmozilla/urls.py
+++ b/airmozilla/urls.py
@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.conf.urls.defaults import patterns, include
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 from funfactory.monkeypatches import patch
 patch()
@@ -12,9 +13,4 @@ urlpatterns = patterns('',
 
 ## In DEBUG mode, serve media files through Django.
 if settings.DEBUG:
-    # Remove leading and trailing slashes so the regex matches.
-    media_url = settings.MEDIA_URL.lstrip('/').rstrip('/')
-    urlpatterns += patterns('',
-        (r'^%s/(?P<path>.*)$' % media_url, 'django.views.static.serve',
-         {'document_root': settings.MEDIA_ROOT}),
-    )
+    urlpatterns += staticfiles_urlpatterns()
diff --git a/media/css/.gitignore b/media/css/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/media/img/.gitignore b/media/img/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/media/js/.gitignore b/media/js/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/media/js/main/libs/jquery.cookie.js b/media/js/main/libs/jquery.cookie.js
deleted file mode 100644
index 6df1faca..00000000
--- a/media/js/main/libs/jquery.cookie.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Cookie plugin
- *
- * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- */
-
-/**
- * Create a cookie with the given name and value and other optional parameters.
- *
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Set the value of a cookie.
- * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
- * @desc Create a cookie with all available options.
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Create a session cookie.
- * @example $.cookie('the_cookie', null);
- * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
- *       used when the cookie was set.
- *
- * @param String name The name of the cookie.
- * @param String value The value of the cookie.
- * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
- * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
- *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
- *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
- *                             when the the browser exits.
- * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
- * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
- * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
- *                        require a secure protocol (like HTTPS).
- * @type undefined
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-
-/**
- * Get the value of a cookie with the given name.
- *
- * @example $.cookie('the_cookie');
- * @desc Get the value of a cookie.
- *
- * @param String name The name of the cookie.
- * @return The value of the cookie.
- * @type String
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-jQuery.cookie = function(name, value, options) {
-    if (typeof value != 'undefined') { // name and value given, set cookie
-        options = options || {};
-        if (value === null) {
-            value = '';
-            options.expires = -1;
-        }
-        var expires = '';
-        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
-            var date;
-            if (typeof options.expires == 'number') {
-                date = new Date();
-                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
-            } else {
-                date = options.expires;
-            }
-            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
-        }
-        // CAUTION: Needed to parenthesize options.path and options.domain
-        // in the following expressions, otherwise they evaluate to undefined
-        // in the packed version for some reason...
-        var path = options.path ? '; path=' + (options.path) : '';
-        var domain = options.domain ? '; domain=' + (options.domain) : '';
-        var secure = options.secure ? '; secure' : '';
-        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
-    } else { // only name given, get cookie
-        var cookieValue = null;
-        if (document.cookie && document.cookie != '') {
-            var cookies = document.cookie.split(';');
-            for (var i = 0; i < cookies.length; i++) {
-                var cookie = jQuery.trim(cookies[i]);
-                // Does this cookie string begin with the name we want?
-                if (cookie.substring(0, name.length + 1) == (name + '=')) {
-                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                    break;
-                }
-            }
-        }
-        return cookieValue;
-    }
-};
\ No newline at end of file
diff --git a/requirements/dev.txt b/requirements/dev.txt
index a9955e68..43c2ab5b 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -4,3 +4,4 @@
 
 -r ../vendor/src/funfactory/funfactory/requirements/compiled.txt
 -r ../vendor/src/funfactory/funfactory/requirements/dev.txt
+mock==0.8.0
diff --git a/vendor b/vendor
index f7805f43..1191311e 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit f7805f43f377958335789d657c6e6d8e4a46c78f
+Subproject commit 1191311eae137f51b27c210b9857e4e302581f0d
