User menu, various fixes

urls.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.conf.urls.defaults import patterns, include, url
 from django.contrib import admin
 admin.autodiscover()
@@ -5,14 +6,12 @@ admin.autodiscover()
 urlpatterns = patterns('',
     url(r'^$', 'main.views.register', name='home'),
     url(r'', include('main.urls')),
-    url(r'^accounts/login/$', 'django.contrib.auth.views.login'),
-    url(r'^logout/$', 'main.views.logout'),
+    url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
+    url(r'^logout/$', 'main.views.logout', name='logout'),
 
     url(r'^admin/', include(admin.site.urls)),
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
 )
 
-#from django.contrib.staticfiles.urls import staticfiles_urlpatterns # for dev
-#urlpatterns += staticfiles_urlpatterns()
+if settings.DEBUG:
+    from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+    urlpatterns += staticfiles_urlpatterns()