fixes and features from gulp-coffee