beginning static cache settings, only works 2 levels deep for now
Merge branch 'master' into static

Conflicts:
	package.json
	themes/studentlife/css/master.css
	themes/studentlife/css/master.css.map
Revert "Merge branch 'master' into static"

This reverts commit 79d1528996be908d950a745688fd7c37485a0015, reversing
changes made to 2a8ddbed38c8d183bed7e1a907996e672583f9cb.
htaccess is fixed to work four levels deep
Merge branch 'static'

Conflicts:
	themes/studentlife/css/master.css
	themes/studentlife/css/master.css.map
	themes/studentlife/templates/Includes/Byline.ss
	themes/studentlife/templates/Layout/MemberPage.ss
	themes/studentlife/templates/Layout/NewsEntry.ss