Use Gulp's built in watch function and fix gulp spy