refactor to use more SCSS
remove unrequired file from server.js, fix whitespace in gruntfile
re-generated CSS files from updated SCSS
Merge branch 'cloudy'