Re-write for simplicity and Sass 3.3

WIP. Needs tests and docs.