Upgrade 'grunt watch' as it wasn't triggering properly and make config syntax consistent