diff --git a/Makefile b/Makefile
index b6d02f21..e98208c7 100644
--- a/Makefile
+++ b/Makefile
@@ -111,6 +111,7 @@ git-install-hooks:
 
 git-clean-local: git-check-on-dev
 	for b in `git branch --list "feature_*" --merged`; do git branch -d "$$b"; done;
+	for b in `git branch --list "bug_*" --merged`; do git branch -d "$$b"; done;
 
 git-check-on-dev:
 	@git status -b -s | grep "## development...origin/development"
diff --git a/scidash/main/urls.py b/scidash/main/urls.py
index a3a95591..4dba59ed 100644
--- a/scidash/main/urls.py
+++ b/scidash/main/urls.py
@@ -61,11 +61,10 @@
 )
 
 urlpatterns = [
-    url(r'^', include('pygeppetto_server.urls')),
     url(r'^admin/', admin.site.urls),
-    url(r'^api/login/', obtain_jwt_token),
-    url(r'^data/', include('scidash.general.urls')),
-    url(r'^api/date-range', DateRangeView.as_view(), name='date-range-view'),
+    url(r'^api/login/?$', obtain_jwt_token),
+    url(r'^data/?$', include('scidash.general.urls')),
+    url(r'^api/date-range/?$', DateRangeView.as_view(), name='date-range-view'),
     url(r'^api/', include(router.urls)),
     url(r'^auth/', include('django.contrib.auth.urls')),
     url(
@@ -83,9 +82,9 @@
         ),
         name='password-reset'
     ),
-    url(r'^auth/sign-up/', signup, name='sign-up'),
+    url(r'^auth/sign-up/?$', signup, name='sign-up'),
     url(
-        r'^api/users/me/$',
+        r'^api/users/me/?$',
         UserViewSet.as_view({
             'get': 'retrieve'
         }),
@@ -93,6 +92,7 @@
         name='user-info'
     ),
     url(
-        r'^api/users/is-logged', CheckIsLoggedView.as_view(), name='is-logged'
+        r'^api/users/is-logged/?$', CheckIsLoggedView.as_view(), name='is-logged'
     ),
+    url(r'^', include('pygeppetto_server.urls')),
 ]