Try underscored file

Allow for the SCSS _ convention. Note that this merge is dependent on my "working_at_import" branch. So the only real commit for this branch is ff15639. Everything else is just inherited from my other pull request.