Merge with hcatlin/master and fix for imports on windows

I've merged with code from hcatlin/master
My commits are fixes for relative imports on windows (ie. ../variables.scss had problem with finding paths)