Fix typo in default 'from' email
Merge pull request #530 from tusbar/no-reply-typo

Fix typo in default 'from' email
Add notifier configuration options

This change corresponds to notifier commits 73c67a9 and 88aa593.
Merge pull request #506 from edx/gprice/notifier-config

Add notifier configuration options
Replace ORA XQueue vars
Merge pull request #531 from edx/will/ora-var-fixes

Replace ORA XQueue vars
Added exception for 127.0.0.1 in basic auth
Merge pull request #532 from edx/will/basic-auth-localhost

Disable basic auth for 127.0.0.1
Checkout ease and ora master branch instead of HEAD
Merge pull request #535 from edx/will/ora-and-ease-version

Checkout ease and ora master branch instead of HEAD
Configure NLTK_DATA environment variable for ORA celery workers
This converts lms-preview variant to supervisor
and adds a clause to rake not to gather assets as it fails
Merge pull request #538 from edx/cg/lms-preview-supervisor

This converts lms-preview variant to supervisor
Merge pull request #537 from edx/will/ora-celery-nltk-config

Configure NLTK_DATA environment variable for ORA celery workers
Updated devstack role to include ORA
Merge pull request #539 from edx/will/ora-devstack

Updated devstack role to include ORA
Lowered ORA minimum submissions for ML and peer grading
Merge pull request #544 from edx/will/lower-ora-limits

Lowered ORA minimum submissions for ML and peer grading
Merge branch 'master' into jarv/abbey