Had to make these changes to get the css to compile
Merge branch 'css_troubles'