fixed some bugs in gulpfile - work in progress