minor comment cleanup.
update readme for sticky nav notice
Merge remote-tracking branch 'snide/master'

Conflicts:
	README.rst
	demo_docs/source/conf.py