Gulp tweaks

Some gulp tweaks for a more robust and nagging free workflow.