Changes lockfile for windows
Changes to using SCSS bootstrap (no more less, no more ruby racer)
Merge branch 'master' into windows