Backporting a feature from a newer version to 0.4.0

Have to do it because the newer versions of grunt-contrib-watch are very
slow to initialize for large number of watched files