Merge branch 'master' of github.com:econchick/rogueojiiofwales into crazy

Conflicts:
	urls.py

urls.py

@@ -11,9 +11,13 @@ admin.autodiscover()
 urlpatterns = patterns('',
     url(r'^%s(?P<path>.*)$' % re.escape(settings.STATIC_URL.lstrip('/')), 'django.contrib.staticfiles.views.serve', {'insecure': True}),
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^followers/', views.graph_followers,
+        name='graph_followers'),
     url(r'^login/$', views.login, name='login'),
     url(r'^me/$', 'githubnetwork.views.me', name='me'),
     url(r'^ajax/$', 'githubnetwork.views.get_user_followers', name='get_user_followers'),
+    url(r'^repo/(?P<user>\w+)/(?P<repo>\w+)/', views.graph_repo,
+        name='graph_repo'),
     url(r'^$', views.index, name='index'),
     url(r'', include('social_auth.urls')),
 )