Revert "small bugfixes for theming+sass+templates"

This reverts commit 5f3313ece467a537b67af1aed9189af220308cb8.

@wedaly 

PR to revert the commit that's breaking tests for now.  I suspect some configuration should be modified.