Adjusted generated gulpfile so that watching doesn't get so out of hand
Moved app and client tasks as dependencies to watch