Merge branch 'snide-master' into move-javascript-to-bottom

Conflicts:
	sphinx_rtd_theme/layout.html
Merge branch 'snide-master' into sticky-navigation
Commenting out sticky_navigation option by default
Merge branch 'sticky-navigation'

Conflicts:
	demo_docs/source/conf.py
Merge branch 'move-javascript-to-bottom'

Conflicts:
	sphinx_rtd_theme/layout.html