Merge pull request #1 from faulteh/master

Changes to get website deployable in production.

.gitignore

@@ -4,3 +4,5 @@ _build/
 .DS_Store
 dev.db
 .coverage
+pinaxcon/site_media/
+local_settings.py

pinaxcon/settings.py

@@ -233,3 +233,9 @@ NOSE_ARGS = [
     '--with-coverage',
     '--cover-package=registrasion.controllers,registrasion.models',
 ]
+
+# Production settings have their own file to override stuff here
+try:
+    from local_settings import *
+except ImportError:
+    pass

requirements.txt

@@ -1,4 +1,5 @@
-Django==1.9.2
+# Should use latest 1.9 for security
+Django>=1.9.2
 pinax-theme-bootstrap==7.3.0
 django-user-accounts==1.3.1
 metron==1.3.7
@@ -12,6 +13,7 @@ pinax-boxes==2.1.2
 django-nose==1.4.3
 coverage==4.0.3
 
-# Registrasion
+# Registrasion + Symposion
-registrasion==0.1.1
+# Install via pip repo cloned locally
-https://github.com/lca2017/symposion/tarball/master#egg=symposion
+#registrasion==0.1.1
+#https://github.com/lca2017/symposion/tarball/master#egg=symposion