Add conditional include for default theme
[REMOVE] updating bower.json to test branch; should remove in rebase