Cleaning up gulp tasks
Merge branch 'master' into custom