made necessary changes to docs for 2.1 release
Merge pull request #719 from nraychaudhuri/update_documentation_for_2.1

made necessary changes to docs for 2.1 release