gulpfile.js: change which javascript files are fed into the input stream
CALSboilerplate_underscores_custom.js: follow conventions to comply with jshint
fix typo in master.scss