Conflicts:
	doc/public/index.rst

Update discussion documentation

Fix typo in output message of rakefile

Forgot to remove registration of onKeyUp function.

Remove keybinding for work in progress (WIP).

fix gradebook tests

STUD-329

create-dev-env.sh:  if run from repo, set $BASE appropriately

Remove the unused smart-accordion lettuce feature, and the code it used.

Fix 500 error on reactivation email

Remove unused reactivation email function

Jonahstanley/add courseteam tests

Because it bothers me, although I don't expect anyone else to care.

Restore Pylint/Pep8 reports

Shibboleth Auth

test suite, so the clean reports command doesn't blow
away the reports.

Changed a click to css_click and fixed earlier typo

Report Dir Acceptance Test Fix

Fix pylint violations in xmodule static_content.py

directory is created before it is cleaned.

Clean tests step now removes stale coverage report files.

* Changed unicode test cases to ascii encoding
* Removed 'stanford' hardcoding in TOS logic in lieu of
  'SHIB_DISABLE_TOS' MIT_FEATURES flag
* made 'external_auth' always an installed_app in lms
* log.exception changd to log.error where appropriate

But: did not change skipping tests to changing settings, for
reasons stated here:
https://github.com/edx/edx-platform/pull/67#issuecomment-19790330

Ned/remove unused imports

Remove simplewiki from the codebase

Clean up pep8 E128 issues

Cale/create dev env fixes