Merge branch 'master' of github.com:pythonkc/pythonkc.com

Author: estebistec

.gitignore

@@ -1,3 +1,3 @@
 .gondor
-pythonkc.kpf
 *.pyc
+pythonkc_site/pythonkc.sqlite

AUTHORS

@@ -1,4 +1,5 @@
 Steven Cummings
 Julia Elman
+Matthew Irish
 Mark Ransom
 Jeff Triplett

pythonkc_site/requirements/project.txt

@@ -1,3 +1,4 @@
 Django==1.3
 gondor==1.0b1.post12
-psycopg2==2.4.1
+psycopg2==2.4.1
+South==0.7.3

pythonkc_site/settings.py

@@ -15,8 +15,8 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': '',                      # Or path to database file if using sqlite3.
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': os.path.join(os.path.abspath(os.path.dirname(__file__)), 'pythonkc.sqlite'), # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
@@ -121,9 +121,10 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
+    'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
-    # 'django.contrib.admindocs',
+    'django.contrib.admindocs',
+    'south',
 )
 
 # A sample logging configuration. The only tangible logging