cleaned up gulpfile a bit
merge agustin's gulpfile changes