fix and cleanup gulp scripts