Added compass, watched for scss
Merge branch 'master' of https://github.com/shoptology/boilerplate