Removed _folder stuff as it is not implemented in sass_interface.
Merge remote-tracking branch 'origin/master'