Settings and urls cleanup

settings.py.dist

-# Django settings for flowspy project.
-
+# Django settings for grnet project.
+# -*- coding: utf-8 -*- vim:encoding=utf-8:
+# vim: tabstop=4:shiftwidth=4:softtabstop=4:expandtab
 import os
 import djcelery
 djcelery.setup_loader()
@@ -51,7 +52,7 @@ LANGUAGES = (
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'en'
 
 SITE_ID = 1
 
@@ -104,6 +105,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
+    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
 )
 
 AUTHENTICATION_BACKENDS = (
@@ -129,6 +131,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.messages',
+    'django.contrib.flatpages',
     'flowspec',
     'poller',
     'south',

urls.py.dist

@@ -19,8 +19,6 @@ urlpatterns = patterns('',
     url(r'^fod/delete/(?P<route_slug>[\w\-]+)/$', 'flowspy.flowspec.views.delete_route', name="delete-route"),
     url(r'^fod/login/?', 'flowspy.flowspec.views.user_login', name="login"),
     url(r'^fod/welcome/?', 'flowspy.flowspec.views.welcome', name="welcome"),
-    url(r'^fod/info/?', 'flowspy.flowspec.views.getinfo', name="getinfo"),
-    url(r'^fod/tos/?', 'flowspy.flowspec.views.gettos', name="gettos"),
     url(r'^fod/logout/?', 'flowspy.flowspec.views.user_logout', name="logout"),
     (r'^fod/setlang/?$', 'django.views.i18n.set_language'),
     # Uncomment the admin/doc line below to enable admin documentation: