config refactor wip
merging from master
Update pillow to 2.6.1
pep8 and comments
renmaing prod.py and setting more defaults
renaming to use underscores
Pin django-cas to hash
Move to github.txt and make editable
Add base support for cohorted group configurations

TNL-649
Add support for user partitioning based on cohort.

JIRA: TNL-710

IMPORTANT: this commit converts the course_groups
package to using migrations.  When deploying to an
existing openedx instance, migration 0001 may fail
with an error indicating that the CourseUserGroup
table already exists.  If this happens, running
the 0001 migration first, with the --fake option,
is recommended.  After performing this step,
remaining migrations should work as expected.
Add group_access field to all xblocks

TNL-670
avoid errors when forward-migrating course_groups after south conversion

JIRA: TNL-937
moving the convert_tokens function to a common file
Merge pull request #6160 from edx/jsa/tnl-937

avoid errors when forward-migrating course_groups after south conversion
Merge pull request #6096 from edx/jarv/config-refactor-wip

Jarv/config refactor wip
Document the Open edX package.
Merge pull request #6127 from mitocw/cg/pin_cas_client

Pin django-cas to hash
Revert "Jarv/config refactor wip"
Merge pull request #6181 from edx/revert-6096-jarv/config-refactor-wip

Revert "Jarv/config refactor wip"
Improved support for multiple organization names

Updates copy used in the checkbox label, constructs strings within the view instead of passing through a separate context variable, and alleviates unipain
don't export draft children of orphaned drafted (TNL-923)