diff --git a/requirements.txt b/requirements.txt
index c67767751d480d8161b0e28e7d2b988815930269..c19cef7479a3fdf6f1fd1a6d00be2bea98556bed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Django==1.4.5
-South==0.7.3
+South==0.8.2
 anyjson==0.3.1
 celery==3.0.16
 django-celery==3.0.21
diff --git a/settings.py b/settings.py
index 28f31816af6a47b44d9e50d7f4a8cc43979875ab..8df98060ac7dd53a138867aa08c256416232f694 100644
--- a/settings.py
+++ b/settings.py
@@ -155,13 +155,13 @@ HELIOS_PRIVATE_DEFAULT = False
 
 # authentication systems enabled
 #AUTH_ENABLED_AUTH_SYSTEMS = ['password','facebook','twitter', 'google', 'yahoo']
-AUTH_ENABLED_AUTH_SYSTEMS = ['google']
+AUTH_ENABLED_AUTH_SYSTEMS = get_from_env('AUTH_ENABLED_AUTH_SYSTEMS', 'google').split(",")
 AUTH_DEFAULT_AUTH_SYSTEM = None
 
 # facebook
-FACEBOOK_APP_ID = ''
-FACEBOOK_API_KEY = ''
-FACEBOOK_API_SECRET = ''
+FACEBOOK_APP_ID = get_from_env('FACEBOOK_APP_ID','')
+FACEBOOK_API_KEY = get_from_env('FACEBOOK_API_KEY','')
+FACEBOOK_API_SECRET = get_from_env('FACEBOOK_API_SECRET','')
 
 # twitter
 TWITTER_API_KEY = ''
@@ -178,7 +178,7 @@ LINKEDIN_API_SECRET = ''
 
 # email server
 EMAIL_HOST = get_from_env('EMAIL_HOST', 'localhost')
-EMAIL_PORT = 2525
+EMAIL_PORT = int(get_from_env('EMAIL_PORT', "2525"))
 EMAIL_HOST_USER = get_from_env('EMAIL_HOST_USER', '')
 EMAIL_HOST_PASSWORD = get_from_env('EMAIL_HOST_PASSWORD', '')
 EMAIL_USE_TLS = False