Merge branch 'master' into cleanup

gracedb/urls.py

@@ -8,7 +8,7 @@ from django.conf.urls import patterns, url, include
 from gracedb.api import download
 
 urlpatterns = patterns('gracedb.views',
-    url (r'^$', 'index', name="home"),
+    url (r'^$', 'index', name="home-events"),
     url (r'^create/$', 'create', name="create"),
     url (r'^search/(?P<format>(json|flex))?$', 'search', name="search"),
     url (r'^view/(?P<graceid>[GEHT]\d+)', 'view', name="view"),

urls.py

@@ -17,8 +17,8 @@ feeds = {
 urlpatterns = patterns('',
 
     url (r'^$', 'gracedb.views.index', name="home"),
-    url (r'^SPInfo/', 'gracedb.views.spinfo', name="spinfo"),
-    url (r'^SPPrivacy/', 'gracedb.views.spprivacy', name="spprivacy"),
+    url (r'^SPInfo', 'gracedb.views.spinfo', name="spinfo"),
+    url (r'^SPPrivacy', 'gracedb.views.spprivacy', name="spprivacy"),
     (r'^events/', include('gracedb.urls')),
     (r'^api/',    include('gracedb.urls_rest', app_name="api", namespace="x509")),
     (r'^apiweb/', include('gracedb.urls_rest', app_name="api", namespace="shib")),