fix(@angular/cli): Changed init order to make sure all files gets committed

With the update of npm 5 and the introduction of package-lock.json all files weren't
committed into the first commit.

Author: danielronnkvist

packages/@angular/cli/tasks/init.ts

@@ -88,13 +88,13 @@ export default Task.extend({
 
     return installBlueprint.run(blueprintOpts)
       .then(function () {
-        if (commandOptions.skipGit === false) {
-          return gitInit.run(commandOptions, rawArgs);
+        if (!commandOptions.skipInstall) {
+          return npmInstall.run();
         }
       })
       .then(function () {
-        if (!commandOptions.skipInstall) {
-          return npmInstall.run();
+        if (commandOptions.skipGit === false) {
+          return gitInit.run(commandOptions, rawArgs);
         }
       })
       .then(function () {