Merge branch 'master' into circular

# By Piotr Mitros (5) and others
# Via Samuel Clay (2) and Daniel (1)
* master:
  Normalizing settings.
  Fixed #217. Remove (via Newsblur) when sharing
  Documented additional hack to get into the system without Stripe installed
  Expanded requirements
  Fixed doc. We do require a non-fake migrate as well.
  Removed SES dependency for development. Fixed bug where DEVELOPMENT was used before being overridden by local_settings.py.
  Added requirements.txt

README.md

@@ -87,6 +87,12 @@ Not the easiest to get installed. If you are running Mac OS X, you have a few op
  * Use MacPorts: `sudo port install py26-numpy py26-scipy`
  * Install from source (grueling): [http://www.scipy.org/Download](http://www.scipy.org/Download)
  * Use a combination of pip, easy_install, and [homebrew](http://mxcl.github.com/homebrew/): `pip install numpy && brew install gfortran && easy_install scipy`
+
+#### Other assorted packages
+
+From inside the repository, run: 
+
+    pip install -r requirements.txt
  
 ### Configure paths
 
@@ -132,6 +138,7 @@ these after the installation below.
     
         ./manage.py syncdb --all
         ./manage.py migrate --fake
+        ./manage.py migrate
         ./manage.py loaddata config/fixtures/bootstrap.json
         
     If you don't create a user during `syncdb`, the `bootstrap.json` file will create a 
@@ -148,6 +155,13 @@ these after the installation below.
  
         ./manage.py runserver
  
+ 5. Navigate to: 
+
+         http://localhost:8000/ 
+
+    Create an account. At the end of the account creation process, you
+    will be redirected to https://localhost/profile/stripe_form. Hit
+    the back button a few times, and you will be inside the app.
     
 ### Installing on Linux / Ubuntu
 

media/android/NewsBlur/res/values/strings.xml

@@ -50,7 +50,7 @@
 	
 	<string name="replied">Reply posted</string>
 	<string name="error_replying">There was an error replying</string>
-	<string name="share">\"%1$s\" - %2$s (via NewsBlur)</string>
+	<string name="share">\"%1$s\" - %2$s</string>
 	<string name="shared_title">Share</string>
 	<string name="share_this">Share this story</string>
 	<string name="share_comment_hint">Comment (Optional)</string>

requirements.txt

@@ -0,0 +1,15 @@
+raven
+mongoengine
+pyyaml
+lxml
+feedparser
+celery
+django
+redis
+nltk
+django-extensions
+pyes
+stripe
+cssutils
+django-subdomains
+python-gflags

settings.py

@@ -68,8 +68,7 @@ LOGIN_URL             = '/reader/login'
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
 ADMIN_MEDIA_PREFIX    = '/media/admin/'
-# EMAIL_BACKEND         = 'django_mailgun.MailgunBackend'
-EMAIL_BACKEND         = 'django_ses.SESBackend'
+EMAIL_BACKEND         = 'django.core.mail.backends.console.EmailBackend'
 CIPHER_USERNAMES      = False
 DEBUG_ASSETS          = DEBUG
 HOMEPAGE_USERNAME     = 'popular'
@@ -230,7 +229,6 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django_extensions',
     'djcelery',
-    'django_ses',
     'apps.rss_feeds',
     'apps.reader',
     'apps.analyzer',
@@ -253,12 +251,6 @@ INSTALLED_APPS = (
     'vendor.zebra',
 )
 
-if not DEVELOPMENT:
-    INSTALLED_APPS += (
-        'gunicorn',
-        'raven.contrib.django',
-    )
-
 # ==========
 # = Stripe =
 # ==========
@@ -438,7 +430,7 @@ SESSION_REDIS_DB = 5
 # = Elasticsearch =
 # =================
 
-ELASTICSEARCH_HOSTS = ['db10:9200']
+ELASTICSEARCH_HOSTS = ['db01:9200']
 
 # ===============
 # = Social APIs =
@@ -454,7 +446,7 @@ TWITTER_CONSUMER_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
 # = AWS Backing =
 # ===============
 
-ORIGINAL_PAGE_SERVER = "db10:3060"
+ORIGINAL_PAGE_SERVER = "db01:3060"
 
 BACKED_BY_AWS = {
     'pages_on_s3': False,
@@ -477,6 +469,14 @@ except ImportError, e:
 
 from local_settings import *
 
+if not DEVELOPMENT:
+    INSTALLED_APPS += (
+        'gunicorn',
+        'raven.contrib.django',
+         'django_ses', 
+
+    )
+
 COMPRESS = not DEBUG
 TEMPLATE_DEBUG = DEBUG
 ACCOUNT_ACTIVATION_DAYS = 30
@@ -496,6 +496,7 @@ DEBUG_TOOLBAR_CONFIG = {
 }
 if not DEVELOPMENT:
     RAVEN_CLIENT = raven.Client(SENTRY_DSN)
+    EMAIL_BACKEND         = 'django_ses.SESBackend'
 
 if DEBUG:
     TEMPLATE_LOADERS = (