Incorporate Anant's suggestions
Merge pull request #731 from edx/jkarni/feature/docchanges

Incorporate Anant's suggestions