Merge branch 'dev' into gh-pages

Ready to ship v1 of full-content website!
Merge branch 'dev' into gh-pages
Hot fix: typo
Merge branch 'gh-pages' into dev