Refactored gulp tasks.
Fixed gulpfile conflict.