Fixed a few things and added support for nested @import style sheets.
merged from remote.