Simplify section switching, merge orgName into newUser

resources/frontend_client/app/setup/partials/setup_info.html

 <div class="SetupSteps wrapper wrapper-max-sm">
     <section class="SetupStep bordered rounded relative" ng-class="{ 'SetupStep--active' : activeStep == 'user', 'SetupStep--completed' : completedSteps.user }">
-            <div class="flex align-center py2" ng-click="setActiveStep('user')">
+            <div class="flex align-center py2" ng-click="activeStep = 'user'">
                 <span class="SetupStep-indicator flex layout-centered absolute bordered">
                     <span class="SetupStep-number">1</span>
                     <cv-check-icon class="SetupStep-check" width="16px" height="16px"></cv-check-icon>
@@ -40,7 +40,7 @@
 
                 <div class="Form-field" mb-form-field="organization">
                     <mb-form-label display-name="Organization name" field-name="password"></mb-form-label>
-                    <input class="Form-input Form-offset full" name="organization" type="text" placeholder="Organization name" ng-model="userOrgName" autofocus required>
+                    <input class="Form-input Form-offset full" name="organization" type="text" placeholder="Organization name" ng-model="newUser.orgName" autofocus required>
                     <span class="Form-charm"></span>
                 </div>
 
@@ -56,7 +56,7 @@
     </section>
 
     <section class="SetupStep bordered border-dashed rounded relative" ng-class="{ 'SetupStep--active' : activeStep == 'database', 'SetupStep--completed' : completedSteps.database }">
-        <div class="flex align-center py2" ng-click="setActiveStep('database')">
+        <div class="flex align-center py2">
             <span class="SetupStep-indicator flex layout-centered absolute bordered">
                 <span class="SetupStep-number">2</span>
                 <cv-check-icon class="SetupStep-check" width="16px" height="16px"></cv-check-icon>

resources/frontend_client/app/setup/setup.controllers.js

@@ -23,7 +23,6 @@ SetupControllers.controller('SetupInfo', ['$scope', '$routeParams', '$location',
         };
 
         $scope.newUser = {};
-        $scope.userOrgName = "";
 
         $scope.setActiveStep = function(name) {
             console.log(name);
@@ -107,13 +106,13 @@ SetupControllers.controller('SetupInfo', ['$scope', '$routeParams', '$location',
             if (AppState.model.currentOrg) {
                 return Organization.update({
                     'id': AppState.model.currentOrg.id,
-                    'name': $scope.userOrgName,
-                    'slug': $scope.userOrgName
+                    'name': $scope.newUser.orgName,
+                    'slug': $scope.newUser.orgName
                 }).$promise;
             } else {
                 return Organization.create({
-                    'name': $scope.userOrgName,
-                    'slug': $scope.userOrgName
+                    'name': $scope.newUser.orgName,
+                    'slug': $scope.newUser.orgName
                 }).$promise.then(function(org) {
                     console.log('first org created', org);
 
@@ -125,8 +124,6 @@ SetupControllers.controller('SetupInfo', ['$scope', '$routeParams', '$location',
         }
 
         $scope.createOrgAndUser = function() {
-            console.log("currentOrg", AppState.model.currentOrg);
-            console.log("currentUser", AppState.model.currentUser);
             // start off by creating the first user of the system
             // NOTE: this should both create the user AND log us in and return a session id
             createOrUpdateUser().then(function() {