Merge branch 'master' into customizations

* master:
  Fixing broken signup form for google reader import.
  Adding /load_feeds to repeat visitor tracking, since the iPhone app never hits refresh_feeds.
  Adding celery granularity to fabfile.

apps/profile/middleware.py

@@ -8,7 +8,7 @@ from django.template import Template, Context
 
 class LastSeenMiddleware(object):
     def process_response(self, request, response):
-        if ((request.path in ('/', '/reader/refresh_feeds'))
+        if ((request.path in ('/', '/reader/refresh_feeds', '/reader/load_feeds'))
             and hasattr(request, 'user')
             and request.user.is_authenticated()): 
             hour_ago = datetime.datetime.utcnow() - datetime.timedelta(minutes=60)

fabfile.py

@@ -116,11 +116,17 @@ def staging_full():
 
 @roles('task')
 def celery():
-    with cd(env.NEWSBLUR_PATH):
-        run('git pull')
+    run('git pull')
     celery_stop()
     celery_start()
 
+@roles('task')
+def celery_stop():
+    with cd(env.NEWSBLUR_PATH):
+        run('git pull')
+        celery_stop()
+        celery_start()
+
 @roles('task')
 def celery_stop():
     with cd(env.NEWSBLUR_PATH):
@@ -135,11 +141,9 @@ def celery_start():
         run('tail logs/newsblur.log')
 
 @roles('task')
-def force_celery():
+def kill_celery():
     with cd(env.NEWSBLUR_PATH):
-        run('git pull')
         run('ps aux | grep celeryd | egrep -v grep | awk \'{print $2}\' | sudo xargs kill -9')
-        # run('sudo supervisorctl start celery && tail logs/newsblur.log')
 
 def compress_media():
     with cd('media/js'):

templates/import/signup.xhtml

@@ -1,7 +1,5 @@
 {% extends 'base.html' %}
 
-{% block head_js %}{% endblock head_js %}
-
 {% block content %}
 
 
@@ -19,13 +17,13 @@
         <div class="NB-import-signup" style="margin-top: 24px;">
           <form method="post" action="{% url import-signup %}">
             <div>
-              {{ signup_form.signup_username.label_tag }}
-              {{ signup_form.signup_username }}
+              {{ signup_form.username.label_tag }}
+              {{ signup_form.username }}
             </div>
             <div class="">
               <div class="NB-signup-optional">Optional</div>
-              {{ signup_form.signup_password.label_tag }}
-              {{ signup_form.signup_password }}
+              {{ signup_form.password.label_tag }}
+              {{ signup_form.password }}
             </div>
             <div class="">
               <div class="NB-signup-optional">Optional</div>