Merge pull request #705 from am11/master

Code: Cleanup
SCSS: Adding smart tags. Fixed #419

This would have to be consolidated with LESS when we figure out the best
approach is