Banner
Maybe fixed/maybe broke everything from merge conflicts
Merge branch 'master' into gh-pages. Testing to see if it works.
Minor
Minor 2
Minor edits testing sass cache stuff