Added missing js concats. Added global js dir to watches