Merge branch 'master' into docs_derp

diff --cc _includes/nav-css.html
Simple merge

diff --cc components.html
Simple merge

diff --cc css.html
Simple merge

diff --cc docs-assets/css/docs.css
Simple merge