Merge branch 'master' into work
add gulp-coffee to devdependencies
Merge branch 'work'