Fix notification problem
Add in and route control options
Fix defaults
Fix tests
Fix self assessment test
Address review comments
Merge pull request #621 from edx/fix/vik/oe-issues

Fix/vik/oe issues