Changed logic to get all tasks to work without problems

If you run grunt build it will fail. Changed which tasks get called from "our" tasks so all task works without problems.