Merge branch 'master' into gh-pages
Updates to layouts
Merge branch 'gh-pages'
Merge branch 'master' of https://github.com/deadtype/newdistrict.github.io