Merge branch 'slim_dedicated_server' into develop

* slim_dedicated_server: (44 commits)
  adding postgres dependencies
  adding travis_test setting
  switch travis from mysql to postgres createdb
  irc server
  test failed because no requirement-mysql.pip, remove from travis.yml
  Updated the fabric file for this branch: uwsgi, not gunicorn, nginx, not apache, and no virtualenv.
  In response to upload issue SEL-Columbia#1327 reported by @myf and @donfizachi added a client_max_body_size setting to nginx.conf and confirmed the configuration.
  Added placeholders in default_settings for using S3 as the default file store (strongly recommened for the public AMI).
  Update to the docs for the new public VirtualBox (VDI) option
  Fixed a wiki link reference in the main README
  Updated the install from source document to include the public AMI on AWS as an alternative; also added a reference to /etc/rc.local for celery on AWS
  Updated main README to point to correct & complete instructions for this branch, including a link to how to use the public Formhub AMI on AWS, and added better explanations and links about the code structure.
  Removed reference to 'https://testserver.com/bob' (now a spam blog) which was being used as the form url if 'TESTING_MODE' were true.
  Added the 'TESTING_MODE' definition to settings (which, frustratingly enough, was undefined anywhere except in a staging example, and otherwise unexplained at all)
  Updated the default settings file to accept parameters for AWS/django_ses.SESBackend so that email will work (necessary for new account signup, among other things)
  Fixed typo in install doc
  Confirmed uwsgi.ini settings which will work on debian, either directly, or virtualbox vm
  The mongodb repo maintainers made 2.6.1 available for debian, so removed the corresponding install doc note
  Tweaks to uwsgi.ini
  Fixed the do_reload() function for formhub-uwsgi to use uwsgi's --reload switch
  ...

Conflicts:
	.travis.yml
	README.rst
	extras/celeryd/etc/default/celerybeat
	extras/celeryd/etc/default/celeryd
	formhub/local_settings.py.example
	formhub/preset/dbrouter_example.py
	formhub/preset/default_settings.py
	formhub/preset/example_gis.py
	formhub/preset/example_sqlite.py
	formhub/preset/mysql_test.py
	formhub/preset/production_example.py
	formhub/preset/staging_example.py
	formhub/settings.py
	formhub/wsgi.py
	odk_logger/views.py
	requirements-dev.pip
	requirements-latest.pip
	requirements.pip
	utils/logger_tools.py

.gitignore

@@ -53,5 +53,4 @@ celerybeat-schedule
 
 gunicorn_cfg.py
 run_gunicorn.sh
-static
 celerybeat-schedule

.travis.yml

@@ -4,18 +4,18 @@ services:
 python:
   - "2.7"
 before_install:
-  - mysql -e 'create database formhub_test;'
+  -  sudo apt-get install -y postgresql python-psycopg2 postgresql-contrib
+  -  /usr/lib/postgresql/9.1/bin/createdb FormhubDjangoDB
   -  sudo apt-get install gfortran libatlas-base-dev libjpeg-dev zlib1g-dev
   -  sudo ln -s /usr/lib/`uname -i`-linux-gnu/libjpeg.so ~/virtualenv/python2.7/lib/
   -  sudo ln -s /usr/lib/`uname -i`-linux-gnu/libz.so ~/virtualenv/python2.7/lib/
 install:
   - pip install numpy --use-mirrors
   - pip install -r requirements.pip --use-mirrors
-  - pip install -r requirements-mysql.pip --use-mirrors
-  - python manage.py syncdb --noinput --settings=formhub.preset.travis_test
-  - python manage.py migrate --noinput --settings=formhub.preset.travis_test
+  - python manage.py syncdb --noinput
+  - python manage.py migrate --noinput
 script:
   - python manage.py test --noinput --settings=formhub.preset.travis_test
   - ./js_tests/EnvJasmine/bin/run_all_tests.sh --testDir=../ --configFile=../env_jasmine.conf.js
 notifications:
-  irc: "irc.freenode.org#moditest"
+    irc: "irc.freenode.org#sel-columbia"

README.rst

@@ -1,29 +1,32 @@
-eHealth Africa
-==============
-this copy of the Formhub software is customized for the use and convenience of https://www.ehealthafrica.org
-and our customers.  More complete documentation is found in the wiki at https://github.com/vernondcole/formhub/wiki
-
-v v v v v v text below this point is unaltered from the original v v v v v v 
-
 Formhub
 =======
 
-.. image:: https://secure.travis-ci.org/modilabs/formhub.png?branch=master
-  :target: http://travis-ci.org/modilabs/formhub
+Getting Started
+---------------
 
-Installation
-------------
-Please read the `Installation and Deployment Guide <https://github.com/modilabs/formhub/wiki/Installation-and-Deployment>`_.
+* To build and install from source, follow the `Installation Guide <docs/install/README.md>`_
+
+* Alternatively, you can just use these pre-built server images instead:
+
+  * The public Formhub Amazon Machine Image (AMI) to `Run Your Own Formhub Instances on Amazon Web Services (AWS) <https://github.com/SEL-Columbia/formhub/wiki/How-To-Run-Your-Own-Formhub-Instances-on-Amazon-Web-Services>`_
+
+  * The public Formhub Virtual Disk Image (VDI) to `Run Your Own Formhub Instances on VirtualBox <https://github.com/SEL-Columbia/formhub/wiki/How-To-Run-Your-Own-Formhub-Virtual-Machines-on-VirtualBox>`_
 
 Contributing
 ------------
 
 If you would like to contribute code please read
-`Contributing Code to Formhub <https://github.com/eHealthAfrica/formhub/blob/develop/CONTRIBUTING.md>`_.
+`Contributing Code to Formhub <https://github.com/SEL-Columbia/formhub/wiki/Contributing-Code-to-Formhub>`_.
 
 Code Structure
 --------------
 
+Formhub is written in `Python <https://www.python.org/>`_, using the `Django Web Framework <https://www.djangoproject.com/>`_. 
+
+In Django terms, an "app" is a bundle of Django code, including models and views, that lives together in a single Python package and represents a full Django application.
+
+Formhub consists of three Django apps:
+
 * odk_logger - This app serves XForms to ODK Collect and receives
   submissions from ODK Collect. This is a stand alone application.
 
@@ -35,10 +38,14 @@ Code Structure
 * main - This app is the glue that brings odk_logger and odk_viewer
   together.
 
-Localization
-------------
+Internationalization and Localization
+-------------------------------------
+
+Formhub can be presented in specific languages and formats, customized for specific audiences.
+
+These examples were derived from `Django's Internationalization and Localization Documentation <https://docs.djangoproject.com/en/dev/topics/i18n/>`_ and there is also a good explanation in `The Django Book's Chapter on Internationalization <http://www.djangobook.com/en/2.0/chapter19.html>`_.
 
-To generate a locale from scratch (ex. Spanish)
+To generate a locale from scratch, e.g. Spanish:
 
 .. code-block:: sh