high performance name change
Merge branch 'master' into high-performance

Conflicts:
	guides/production.md
Consistency tweaks
Set up /guides/high-performance 301 redirect
Minor tweak
Merge pull request #2 from divshot/high-performance

High-Performance Changes