From 76a255fb7bf819ac85d5b5b516da9d66456e4cbf Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 2 Nov 2017 17:16:57 -0600
Subject: [PATCH] initial pass at status support

---
 .nodemon.json                                 |   8 +-
 bin/cli-users                                 | 109 +---
 circle.yml                                    |   7 +-
 client/coral-admin/src/containers/Header.js   |   2 +-
 .../routes/Community/containers/Community.js  |   2 +-
 .../components/CloseCommentsInfo.js           |   2 +-
 client/coral-settings/components/Bio.css      |  21 -
 client/coral-settings/components/Bio.js       |  18 -
 .../coral-settings/containers/BioContainer.js |  45 --
 errors.js                                     |   2 +-
 graph/mutators/action.js                      |  10 -
 graph/mutators/user.js                        | 118 +++-
 graph/resolvers/root_mutation.js              |  15 +-
 graph/resolvers/user.js                       |  13 +-
 graph/setupFunctions.js                       |   6 +-
 graph/typeDefs.graphql                        | 194 ++++--
 models/enum/user_status.js                    |   6 -
 models/enum/user_status_username.js           |  25 +
 models/user.js                                | 141 +++-
 package.json                                  |  61 +-
 perms/constants/mutation.js                   |   6 +-
 perms/reducers/index.js                       |  11 +-
 perms/reducers/mutation.js                    |  12 +-
 perms/reducers/query.js                       |  14 +-
 perms/reducers/subscription.js                |   8 +-
 routes/api/account/index.js                   |   9 -
 routes/api/users/index.js                     |  80 +--
 routes/index.js                               |  75 ++-
 scripts/e2e-ci.sh                             |   4 +-
 serve.js                                      |   4 +-
 services/assets.js                            |   4 +-
 services/{domainlist.js => domain_list.js}    |  16 +-
 services/users.js                             | 293 ++-------
 test/helpers/mongoose.js                      |   3 +-
 test/helpers/rejection.js                     |   3 +
 test/server/graph/mutations/addTag.js         |   2 +-
 test/server/graph/mutations/createComment.js  | 116 ++--
 test/server/graph/mutations/removeTag.js      |   2 +-
 .../graph/mutations/setUserBanStatus.js       | 104 +++
 .../mutations/setUserSuspensionStatus.js      | 115 ++++
 .../graph/mutations/setUserUsernameStatus.js  |  87 +++
 .../graph/mutations/updateAssetSettings.js    |   3 +-
 test/server/graph/mutations/updateSettings.js |   3 +-
 test/server/routes/api/account/index.js       |  57 --
 test/server/routes/api/user/index.js          |  49 --
 .../{domainlist.js => domain_list.js}         |  20 +-
 test/server/services/scraper.js               |  22 -
 test/server/services/users.js                 | 169 ++---
 yarn.lock                                     | 614 ++++--------------
 49 files changed, 1112 insertions(+), 1598 deletions(-)
 delete mode 100644 client/coral-settings/components/Bio.css
 delete mode 100644 client/coral-settings/components/Bio.js
 delete mode 100644 client/coral-settings/containers/BioContainer.js
 delete mode 100644 models/enum/user_status.js
 create mode 100644 models/enum/user_status_username.js
 rename services/{domainlist.js => domain_list.js} (85%)
 create mode 100644 test/helpers/rejection.js
 create mode 100644 test/server/graph/mutations/setUserBanStatus.js
 create mode 100644 test/server/graph/mutations/setUserSuspensionStatus.js
 create mode 100644 test/server/graph/mutations/setUserUsernameStatus.js
 delete mode 100644 test/server/routes/api/account/index.js
 rename test/server/services/{domainlist.js => domain_list.js} (87%)
 delete mode 100644 test/server/services/scraper.js

diff --git a/.nodemon.json b/.nodemon.json
index 7f7fd3d59..36fed8700 100644
--- a/.nodemon.json
+++ b/.nodemon.json
@@ -1,5 +1,11 @@
 {
+  "exec": "npm-run-all --parallel generate-introspection start:development",
   "verbose": true,
   "ignore": ["test/*", "client/*", "dist/*", "plugins/*/client"],
-  "ext": "js,json,graphql"
+  "ext": "js,json,graphql",
+  "watch": [
+    ".",
+    "bin/cli",
+    "bin/cli-serve"
+  ]
 }
diff --git a/bin/cli-users b/bin/cli-users
index 89f53a67d..b82ee561d 100755
--- a/bin/cli-users
+++ b/bin/cli-users
@@ -106,20 +106,17 @@ async function createUser(options) {
     }
 
     const user = await UsersService.createLocalUser(answers.email.trim(), answers.password.trim(), answers.username.trim());
-    console.log(`Created user ${user.id}.`);
 
     if (answers.roles.length > 0) {
-      return Promise.all(answers.roles.map((role) => {
-        return UsersService
-          .addRoleToUser(user.id, role)
-          .then(() => {
-            console.log(`Added the role ${role} to User ${user.id}.`);
-          });
-      }));
+      for (const role of answers.roles) {
+        await UsersService.addRoleToUser(user.id, role);
+      }
     }
 
-    util.shutdown();
+    await UsersService.sendEmailConfirmation(user, answers.email.trim());
 
+    console.log(`Created User ${user.id}.`);
+    util.shutdown();
   } catch (err) {
     console.error(err);
     util.shutdown();
@@ -241,12 +238,12 @@ function listUsers() {
       });
 
       users.forEach((user) => {
-        let state = user.disabled ? 'Disabled' : 'Enabled';
         const profile = user.profiles.find(({provider}) => provider === 'local');
+        let state;
         if (profile && profile.metadata && profile.metadata.confirmed_at) {
-          state += ', Verified';
+          state = 'Verified';
         } else {
-          state += ', Unverified';
+          state = 'Unverified';
         }
 
         table.push([
@@ -336,74 +333,6 @@ function removeRole(userID, role) {
     });
 }
 
-/**
- * Ban a user
- * @param  {String} userID id of the user to ban
- */
-function ban(userID) {
-  UsersService
-    .setStatus(userID, 'BANNED')
-    .then(() => {
-      console.log(`Banned the User ${userID}.`);
-      util.shutdown();
-    })
-    .catch((err) => {
-      console.error(err);
-      util.shutdown(1);
-    });
-}
-
-/**
- * Unban a user
- * @param  {String} userUD id of the user to remove the role from
- */
-function unban(userID) {
-  UsersService
-    .setStatus(userID, 'ACTIVE')
-    .then(() => {
-      console.log(`Unban the User ${userID}.`);
-      util.shutdown();
-    })
-    .catch((err) => {
-      console.error(err);
-      util.shutdown(1);
-    });
-}
-
-/**
- * Disable a given user.
- * @param  {String} userID the ID of a user to disable
- */
-function disableUser(userID) {
-  UsersService
-    .disableUser(userID)
-    .then(() => {
-      console.log(`User ${userID} was disabled.`);
-      util.shutdown();
-    })
-    .catch((err) => {
-      console.error(err);
-      util.shutdown(1);
-    });
-}
-
-/**
- * Enabled a given user.
- * @param  {String} userID the ID of a user to enable
- */
-function enableUser(userID) {
-  UsersService
-    .enableUser(userID)
-    .then(() => {
-      console.log(`User ${userID} was enabled.`);
-      util.shutdown();
-    })
-    .catch((err) => {
-      console.error(err);
-      util.shutdown(1);
-    });
-}
-
 /**
  * Verifies an email address for a user.
  *
@@ -472,26 +401,6 @@ program
   .description('removes a role from a given user')
   .action(removeRole);
 
-program
-  .command('ban <userID>')
-  .description('ban a given user')
-  .action(ban);
-
-program
-  .command('uban <userID>')
-  .description('unban a given user')
-  .action(unban);
-
-program
-  .command('disable <userID>')
-  .description('disable a given user from logging in')
-  .action(disableUser);
-
-program
-  .command('enable <userID>')
-  .description('enable a given user from logging in')
-  .action(enableUser);
-
 program
   .command('verify <userID> <email>')
   .description('verifies the given user\'s email address')
diff --git a/circle.yml b/circle.yml
index 9f35736c6..ebb746669 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,6 +7,8 @@ machine:
   environment:
     PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
     NODE_ENV: "test"
+    MOCHA_FILE: "${CIRCLE_TEST_REPORTS}/junit/test-results.xml"
+    MOCHA_REPORTER: "mocha-junit-reporter"
   pre:
     # TODO: use the following to add in support for MongoDB 3.4.
     # # Upgrade the database version to 3.4.
@@ -47,10 +49,11 @@ database:
 test:
   override:
     # Run the tests using the junit reporter.
-    - MOCHA_FILE=$CIRCLE_TEST_REPORTS/junit/test-results.xml MOCHA_REPORTER=mocha-junit-reporter yarn test
+    - yarn test
+    # Run the end to end tests
+    - yarn e2e:ci
     # Check dependancies using nsp.
     - nsp check
-    - yarn e2e-ci
 
 deployment:
   release:
diff --git a/client/coral-admin/src/containers/Header.js b/client/coral-admin/src/containers/Header.js
index a5c1f0afc..e2c3692c4 100644
--- a/client/coral-admin/src/containers/Header.js
+++ b/client/coral-admin/src/containers/Header.js
@@ -14,7 +14,7 @@ export default withQuery(gql`
     })
     flaggedUsernamesCount: userCount(query: {
       action_type: FLAG,
-      statuses: [PENDING]
+      statuses: [SET, CHANGED]
     })
   }
 `, {
diff --git a/client/coral-admin/src/routes/Community/containers/Community.js b/client/coral-admin/src/routes/Community/containers/Community.js
index 4cf9eeb8a..6cb5e700d 100644
--- a/client/coral-admin/src/routes/Community/containers/Community.js
+++ b/client/coral-admin/src/routes/Community/containers/Community.js
@@ -22,7 +22,7 @@ const withData = withQuery(gql`
   query TalkAdmin_Community {
     flaggedUsernamesCount: userCount(query: {
       action_type: FLAG,
-      statuses: [PENDING]
+      statuses: [SET, CHANGED]
     })
     ...${getDefinitionName(FlaggedAccounts.fragments.root)}
     ...${getDefinitionName(FlaggedUser.fragments.root)}
diff --git a/client/coral-configure/components/CloseCommentsInfo.js b/client/coral-configure/components/CloseCommentsInfo.js
index d10419f3f..cc0e12a77 100644
--- a/client/coral-configure/components/CloseCommentsInfo.js
+++ b/client/coral-configure/components/CloseCommentsInfo.js
@@ -26,4 +26,4 @@ CloseCommentsInfo.propTypes = {
   onClick: PropTypes.func,
 };
 
-export default CloseCommentsInfo;
\ No newline at end of file
+export default CloseCommentsInfo;
diff --git a/client/coral-settings/components/Bio.css b/client/coral-settings/components/Bio.css
deleted file mode 100644
index 8c36b989d..000000000
--- a/client/coral-settings/components/Bio.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.bio textarea {
-  width: 100%;
-  box-sizing: border-box;
-  border-radius: 2px;
-  min-height: 100px;
-  margin: 10px 0;
-  border: solid 1px #d8d8d8;
-}
-
-.bio h1 {
-  font-size: 16px;
-  margin: 3px 0;
-}
-
-.bio p {
-  margin: 3px 0;
-}
-
-.actions {
-  text-align: right;
-}
diff --git a/client/coral-settings/components/Bio.js b/client/coral-settings/components/Bio.js
deleted file mode 100644
index cd1347781..000000000
--- a/client/coral-settings/components/Bio.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import styles from './Bio.css';
-import {Button} from '../../coral-ui';
-
-export default ({bio, handleSave, handleInput, handleCancel}) => (
-  <div className={styles.bio}>
-    <h1>Bio</h1>
-    <p>Tell the community about yourself</p>
-    <form>
-      <textarea value={bio} onChange={handleInput} />
-      <div className={styles.actions}>
-        <Button cStyle='cancel' type="button" onClick={handleCancel} raised>Cancel</Button>
-        <Button cStyle='success' type="submit" onClick={handleSave}>Save Changes</Button>
-      </div>
-    </form>
-  </div>
-);
-
diff --git a/client/coral-settings/containers/BioContainer.js b/client/coral-settings/containers/BioContainer.js
deleted file mode 100644
index b7c9611d4..000000000
--- a/client/coral-settings/containers/BioContainer.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import React, {Component} from 'react';
-import Bio from '../components/Bio';
-
-export default class BioContainer extends Component {
-  constructor (props) {
-    super(props);
-
-    this.state = {
-      bio: props.bio
-    };
-
-    this.handleSave = this.handleSave.bind(this);
-    this.handleInput = this.handleInput.bind(this);
-    this.handleCancel = this.handleCancel.bind(this);
-  }
-
-  handleInput(e) {
-    this.setState({
-      bio: e.target.value
-    });
-  }
-
-  handleSave (e) {
-    e.preventDefault();
-    const {userData, saveBio} = this.props;
-    const {bio} = this.state;
-    saveBio(userData.id, {bio});
-  }
-
-  handleCancel () {
-    this.setState({
-      bio: this.props.bio
-    });
-  }
-
-  render () {
-    return <Bio
-      bio={this.state.bio}
-      userData={this.props.userData}
-      handleSave={this.handleSave}
-      handleInput={this.handleInput}
-      handleCancel={this.handleCancel}
-    />;
-  }
-}
diff --git a/errors.js b/errors.js
index 3d145d197..86953ee02 100644
--- a/errors.js
+++ b/errors.js
@@ -244,4 +244,4 @@ module.exports = {
   ErrSpecialChars,
   ErrUsernameTaken,
   ExtendableError,
-};
\ No newline at end of file
+};
diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index 93806ced9..44b33e308 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -1,5 +1,4 @@
 const ActionsService = require('../../services/actions');
-const UsersService = require('../../services/users');
 const errors = require('../../errors');
 const {CREATE_ACTION, DELETE_ACTION} = require('../../perms/constants');
 
@@ -31,15 +30,6 @@ const createAction = async ({user = {}, pubsub, loaders: {Comments}}, {item_id,
     metadata
   });
 
-  if (item_type === 'USERS' && action_type === 'FLAG') {
-
-    // Set the user as pending if it was a user flag and user has no Admin, Staff or Moderation roles
-    let user = await UsersService.findById(item_id);
-    if(!user.isStaff()){
-      await UsersService.setStatus(item_id, 'PENDING');
-    }
-  }
-
   if (comment) {
     pubsub.publish('commentFlagged', comment);
   }
diff --git a/graph/mutators/user.js b/graph/mutators/user.js
index 31fa229aa..44947a390 100644
--- a/graph/mutators/user.js
+++ b/graph/mutators/user.js
@@ -1,29 +1,82 @@
 const errors = require('../../errors');
+const UserModel = require('../../models/user');
 const UsersService = require('../../services/users');
-const {SET_USER_STATUS, SUSPEND_USER, REJECT_USERNAME} = require('../../perms/constants');
+const {
+  SET_USER_USERNAME_STATUS,
+  SET_USER_BAN_STATUS,
+  SET_USER_SUSPENSION_STATUS,
+} = require('../../perms/constants');
 
-const setUserStatus = async ({pubsub}, {id, status}) => {
-  const result = await UsersService.setStatus(id, status);
-  if (result && result.status === 'BANNED') {
-    pubsub.publish('userBanned', result);
+const setUserUsernameStatus = async (ctx, id, status) => {
+  const user = await UserModel.findOneAndUpdate({id}, {
+    $set: {
+      'status.username.status': status
+    },
+    $push: {
+      'status.username.history': {
+        status,
+        assigned_by: ctx.user.id,
+        created_at: Date.now()
+      }
+    }
+  }, {
+    new: true
+  });
+  if (user === null) {
+    throw errors.ErrNotFound;
+  }
+
+  if (status === 'REJECTED') {
+    ctx.pubsub.publish('usernameRejected', user);
   }
-  return result;
 };
 
-const suspendUser = async ({pubsub}, {id, message, until}) => {
-  const result = await UsersService.suspendUser(id, message, until);
-  if (result) {
-    pubsub.publish('userSuspended', result);
+const setUserBanStatus = async (ctx, id, status) => {
+  const user = await UserModel.findOneAndUpdate({id}, {
+    $set: {
+      'status.banned.status': status
+    },
+    $push: {
+      'status.banned.history': {
+        status,
+        assigned_by: ctx.user.id,
+        created_at: Date.now()
+      }
+    }
+  }, {
+    new: true
+  });
+  if (user === null) {
+    throw errors.ErrNotFound;
+  }
+
+  if (user.banned) {
+    ctx.pubsub.publish('userBanned', user);
   }
-  return result;
 };
 
-const rejectUsername = async ({pubsub}, {id, message}) => {
-  const result = await UsersService.rejectUsername(id, message);
-  if (result) {
-    pubsub.publish('usernameRejected', result);
+const setUserSuspensionStatus = async (ctx, id, until) => {
+  const user = await UserModel.findOneAndUpdate({id}, {
+    $set: {
+      'status.suspension.until': until
+    },
+    $push: {
+      'status.suspension.history': {
+        until,
+        assigned_by: ctx.user.id,
+        created_at: Date.now()
+      }
+    }
+  }, {
+    new: true
+  });
+  if (user === null) {
+    throw errors.ErrNotFound;
+  }
+
+  if (user.suspended) {
+    ctx.pubsub.publish('userSuspended', user);
   }
-  return result;
 };
 
 const ignoreUser = ({user}, userToIgnore) => {
@@ -34,27 +87,32 @@ const stopIgnoringUser = ({user}, userToStopIgnoring) => {
   return UsersService.stopIgnoringUsers(user.id, [userToStopIgnoring.id]);
 };
 
-module.exports = (context) => {
+module.exports = (ctx) => {
   let mutators = {
     User: {
-      setUserStatus: () => Promise.reject(errors.ErrNotAuthorized),
-      suspendUser: () => Promise.reject(errors.ErrNotAuthorized),
-      rejectUsername: () => Promise.reject(errors.ErrNotAuthorized),
-      ignoreUser: (action) => ignoreUser(context, action),
-      stopIgnoringUser: (action) => stopIgnoringUser(context, action),
+      ignoreUser: () => Promise.reject(errors.ErrNotAuthorized),
+      stopIgnoringUser: () => Promise.reject(errors.ErrNotAuthorized),
+      setUserUsernameStatus: () => Promise.reject(errors.ErrNotAuthorized),
+      setUserBanStatus: () => Promise.reject(errors.ErrNotAuthorized),
+      setUserSuspensionStatus: () => Promise.reject(errors.ErrNotAuthorized),
     }
   };
 
-  if (context.user && context.user.can(SET_USER_STATUS)) {
-    mutators.User.setUserStatus = (action) => setUserStatus(context, action);
-  }
+  if (ctx.user) {
+    mutators.User.ignoreUser = (action) => ignoreUser(ctx, action);
+    mutators.User.stopIgnoringUser = (action) => stopIgnoringUser(ctx, action);
 
-  if (context.user && context.user.can(SUSPEND_USER)) {
-    mutators.User.suspendUser = (action) => suspendUser(context, action);
-  }
+    if (ctx.user.can(SET_USER_USERNAME_STATUS)) {
+      mutators.User.setUserUsernameStatus = (id, status) => setUserUsernameStatus(ctx, id, status);
+    }
 
-  if (context.user && context.user.can(REJECT_USERNAME)) {
-    mutators.User.rejectUsername = (action) => rejectUsername(context, action);
+    if (ctx.user.can(SET_USER_BAN_STATUS)) {
+      mutators.User.setUserBanStatus = (id, status) => setUserBanStatus(ctx, id, status);
+    }
+
+    if (ctx.user.can(SET_USER_SUSPENSION_STATUS)) {
+      mutators.User.setUserSuspensionStatus = (id, until) => setUserSuspensionStatus(ctx, id, until);
+    }
   }
 
   return mutators;
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index c3bf6b7e9..7dc31fef2 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -19,14 +19,17 @@ const RootMutation = {
   deleteAction: async (_, {id}, {mutators: {Action}}) => {
     await Action.delete({id});
   },
-  setUserStatus: async (_, {id, status}, {mutators: {User}}) => {
-    await User.setUserStatus({id, status});
+  approveUsername: async (_, {id}, {mutators: {User}}) => {
+    await User.setUserUsernameStatus(id, 'APPROVED');
   },
-  suspendUser: async (_, {input: {id, message, until}}, {mutators: {User}}) => {
-    await User.suspendUser({id, message, until});
+  rejectUsername: async (_, {id}, {mutators: {User}}) => {
+    await User.setUserUsernameStatus(id, 'REJECTED');
   },
-  rejectUsername: async (_, {input: {id, message}}, {mutators: {User}}) => {
-    await User.rejectUsername({id, message});
+  setUserSuspensionStatus: async (_, {input: {id, until}}, {mutators: {User}}) => {
+    await User.setUserSuspensionStatus(id, until);
+  },
+  setUserBanStatus: async (_, {input: {id, status}}, {mutators: {User}}) => {
+    await User.setUserBanStatus(id, status);
   },
   ignoreUser: async (_, {id}, {mutators: {User}}) => {
     await User.ignoreUser({id});
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index e5c5746ca..daf1c5899 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -6,7 +6,6 @@ const {
   SEARCH_OTHERS_COMMENTS,
   UPDATE_USER_ROLES,
   SEARCH_COMMENT_METRICS,
-  VIEW_SUSPENSION_INFO,
   LIST_OWN_TOKENS
 } = require('../../perms/constants');
 
@@ -84,12 +83,12 @@ const User = {
     }
   },
 
-  suspension({id, suspension}, _, {user}) {
-    if (user.id !== id && !user.can(VIEW_SUSPENSION_INFO)) {
-      return null;
-    }
-    return suspension;
-  }
+  // suspension({id, suspension}, _, {user}) {
+  //   if (user.id !== id && !user.can(VIEW_SUSPENSION_INFO)) {
+  //     return null;
+  //   }
+  //   return suspension;
+  // }
 };
 
 // Decorate the User type resolver with a tags field.
diff --git a/graph/setupFunctions.js b/graph/setupFunctions.js
index 42dc15a9f..8c32b5bdd 100644
--- a/graph/setupFunctions.js
+++ b/graph/setupFunctions.js
@@ -27,13 +27,13 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
     commentAdded: {
       filter: (comment, context) => {
 
-        // Only priviledged users can subscribe to all assets.
+        // Only privileged users can subscribe to all assets.
         if (!args.asset_id && (!context.user || !context.user.can(SUBSCRIBE_ALL_COMMENT_ADDED))) {
           return false;
         }
 
-        // If user scubsscribes for statuses other than NONE and/or ACCEPTED statuses, it needs
-        // special priviledges.
+        // If user subscribes for statuses other than NONE and/or ACCEPTED statuses, it needs
+        // special privileges.
         if (
           (!args.statuses || args.statuses.some((status) => !['NONE', 'ACCEPTED'].includes(status))) &&
           (!context.user || !context.user.can(SUBSCRIBE_ALL_COMMENT_ADDED))
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 3fbc1cec3..c4dfee445 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -64,8 +64,99 @@ type UserProfile {
   provider: String!
 }
 
-type SuspensionInfo {
+# USER_STATUS_USERNAME is the different states that a username can be in.
+enum USER_STATUS_USERNAME {
+  # UNSET is used when the username can be changed, and does not necessarily
+  # require moderator action to become active. This can be used when the user
+  # signs up with a social login and has the option of setting their own
+  # username.
+  UNSET
+
+  # SET is used when the username has been set for the first time, but cannot
+  # change without the username being rejected by a moderator and that moderator
+  # agreeing that the username should be allowed to change.
+  SET
+
+  # APPROVED is used when the username was changed, and subsequently approved by
+  # said moderator.
+  APPROVED
+
+  # REJECTED is used when the username was changed, and subsequently rejected by
+  # said moderator.
+  REJECTED
+
+  # CHANGED is used after a user has changed their username after it was
+  # rejected.
+  CHANGED
+}
+
+# UserStatusInput describes the queryable components of the UserStatus.
+input UserStatusInput {
+  # username will restrict the returned users to only those with the given
+  # username status's. If not provided, no filtering will be performed.
+  username: [USER_STATUS_USERNAME!]
+
+  # banned will restrict the returned users to only those that are, or are not
+  # banned. If not provided, no filtering will be performed.
+  banned: Boolean
+
+  # suspended will restrict the returned users to only those that are, or are not
+  # suspended. If not provided, no filtering will be performed.
+  suspended: Boolean
+}
+
+type UsernameStatusHistory {
+  status: USER_STATUS_USERNAME!
+  assigned_by: User
+  created_at: Date!
+}
+
+type UsernameStatus {
+  status: USER_STATUS_USERNAME!
+  history: [UsernameStatusHistory!]
+}
+
+type BannedStatusHistory {
+  status: Boolean!
+  assigned_by: User
+  created_at: Date!
+}
+
+type BannedStatus {
+  status: Boolean!
+  history: [BannedStatusHistory!]
+}
+
+type SuspensionStatusHistory {
   until: Date
+  assigned_by: User
+  created_at: Date!
+}
+
+type SuspensionStatus {
+  until: Date
+  history: [SuspensionStatusHistory!]
+}
+
+type UserStatus {
+  # username is the status of the username.
+  username: UsernameStatus!
+
+  # banned is the bool that determines if the user is banned or not.
+  banned: BannedStatus!
+
+  # suspension is the date that the user is suspended until.
+  suspension: SuspensionStatus!
+}
+
+input UserStateInput {
+  status: UserStatusInput
+}
+
+# UserState describes the different permission based details for a user.
+type UserState {
+  # status describes the statuses of different aspects of the user's details.
+  status: UserStatus
 }
 
 # Any person who can author comments, create actions, and view comments on a
@@ -114,11 +205,7 @@ type User {
   reliable: Reliability
 
   # returns user status
-  status: USER_STATUS
-
-  # returns suspension info. Only available to Admins and Moderators
-  # or on own logged in User.
-  suspension: SuspensionInfo
+  state: UserState
 }
 
 # UserConnection represents a paginable subset of a user list.
@@ -143,8 +230,7 @@ input UsersQuery {
   # Users returned will only be ones which have at least one action of this.
   action_type: ACTION_TYPE
 
-  # Current status of a user..
-  statuses: [USER_STATUS!]
+  state: UserStateInput
 
   # Limit the number of results to be returned.
   limit: Int = 10
@@ -261,7 +347,7 @@ enum ACTION_TYPE {
 # CommentsQuery allows the ability to query comments by a specific methods.
 input CommentsQuery {
 
-  # Author of the commente
+  # Author of the comments.
   author_id: ID
 
   # Current status of a comment.
@@ -351,8 +437,8 @@ input UserCountQuery {
   # type.
   action_type: ACTION_TYPE
 
-  # Current status of a user.
-  statuses: [USER_STATUS]
+  # state queries for a specific subset of users with the given state query.
+  state: UserStateInput
 }
 
 type EditInfo {
@@ -810,14 +896,6 @@ enum SORT_COMMENTS_BY {
   REPLIES
 }
 
-# All queries that can be executed.
-enum USER_STATUS {
-  ACTIVE
-  BANNED
-  PENDING
-  APPROVED
-}
-
 # Metrics for the assets.
 enum ASSET_METRICS_SORT {
 
@@ -995,26 +1073,13 @@ input CreateDontAgreeInput {
 }
 
 # Input for suspendUser mutation.
-input SuspendUserInput {
+input SetUserSuspensionStatusInput {
 
   # id of target user.
   id: ID!
 
-  # message to be sent to the user.
-  message: String!
-
   # target user will be suspended until this date.
-  until: Date!
-}
-
-# Input for rejectUsername mutation.
-input RejectUsernameInput {
-
-  # id of target user.
-  id: ID!
-
-  # message to be sent to the user.
-  message: String!
+  until: Date
 }
 
 # Configurable settings that can be overridden for the Asset. You must specify
@@ -1027,7 +1092,7 @@ input AssetSettingsInput {
   # moderation is the moderation mode for the asset.
   moderation: MODERATION_MODE
 
-  # questionBoxEnable will enable the Question Boxs' content to be visable above
+  # questionBoxEnable will enable the Question Boxs' content to be visible above
   # the comment box.
   questionBoxEnable: Boolean
 
@@ -1075,17 +1140,9 @@ type DeleteActionResponse implements Response {
   errors: [UserError!]
 }
 
-# SetUserStatusResponse is the response returned with possibly some errors
-# relating to the delete action attempt.
-type SetUserStatusResponse implements Response {
-
-  # An array of errors relating to the mutation that occurred.
-  errors: [UserError!]
-}
-
-# SuspendUserResponse is the response returned with possibly some errors
-# relating to the suspend action attempt.
-type SuspendUserResponse implements Response {
+# SetUserSuspensionStatusResponse is the response returned with possibly some
+# errors relating to the suspend action attempt.
+type SetUserSuspensionStatusResponse implements Response {
 
   # An array of errors relating to the mutation that occurred.
   errors: [UserError!]
@@ -1218,7 +1275,7 @@ input UpdateSettingsInput {
   # comment is posted that it can still be edited by the author.
   editCommentWindowLength: Int
 
-  # wordlist allows chaninging the available wordlists.
+  # wordlist allows changing the available wordlists.
   wordlist: UpdateWordlistInput
 
   # domains allows changing the available lists of domains.
@@ -1281,6 +1338,29 @@ type RevokeTokenResponse implements Response {
   errors: [UserError!]
 }
 
+# SetUserBanStatusInput contains the input to change the ban status of a given
+# user.
+input SetUserBanStatusInput {
+
+  # id is the user to set the ban status on.
+  id: ID!
+
+  # status is the ban status to set on the target user.
+  status: Boolean!
+}
+
+type SetUserBanStatusResponse implements Response {
+
+  # An array of errors relating to the mutation that occurred.
+  errors: [UserError!]
+}
+
+type SetUsernameStatusResponse implements Response {
+
+  # An array of errors relating to the mutation that occurred.
+  errors: [UserError!]
+}
+
 # All mutations for the application are defined on this object.
 type RootMutation {
 
@@ -1299,17 +1379,21 @@ type RootMutation {
   # Edit a comment
   editComment(id: ID!, asset_id: ID!, edit: EditCommentInput): EditCommentResponse!
 
-  # Sets User status. Requires the `ADMIN` role.
+  # Sets the suspension status on a given user. Requires the `MODERATOR` role.
   # Mutation is restricted.
-  setUserStatus(id: ID!, status: USER_STATUS!): SetUserStatusResponse
+  setUserSuspensionStatus(input: SetUserSuspensionStatusInput!): SetUserSuspensionStatusResponse
 
-  # Suspends a user. Requires the `ADMIN` role.
+  # Sets the ban status on a given user. Requires the `MODERATOR` role.
   # Mutation is restricted.
-  suspendUser(input: SuspendUserInput!): SuspendUserResponse
+  setUserBanStatus(input: SetUserBanStatusInput!): SetUserBanStatusResponse
 
-  # Reject a username. Requires the `ADMIN` role.
-  # Mutation is restricted.
-  rejectUsername(input: RejectUsernameInput!): RejectUsernameResponse
+  # Sets the username status on a given user to `APPROVED`. Requires the
+  # `MODERATOR` role. Mutation is restricted.
+  approveUsername(id: ID!): SetUsernameStatusResponse
+
+  # Sets the username status on a given user to `REJECTED`. Requires the
+  # `MODERATOR` role. Mutation is restricted.
+  rejectUsername(id: ID!): SetUsernameStatusResponse
 
   # Sets Comment status. Requires the `ADMIN` role.
   # Mutation is restricted.
@@ -1327,7 +1411,7 @@ type RootMutation {
 
   # Updates the status of an asset allowing you to close/reopen an asset for
   # commenting.
-    # Mutation is restricted.
+  # Mutation is restricted.
   updateAssetStatus(id: ID!, input: UpdateAssetStatusInput!): UpdateAssetStatusResponse
 
   # updateSettings will update the global settings.
diff --git a/models/enum/user_status.js b/models/enum/user_status.js
deleted file mode 100644
index cec930904..000000000
--- a/models/enum/user_status.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = [
-  'ACTIVE',
-  'BANNED',
-  'PENDING',
-  'APPROVED' // Indicates that the users' username has been approved
-];
diff --git a/models/enum/user_status_username.js b/models/enum/user_status_username.js
new file mode 100644
index 000000000..686113bea
--- /dev/null
+++ b/models/enum/user_status_username.js
@@ -0,0 +1,25 @@
+module.exports = [
+
+  // UNSET is used when the username can be changed, and does not necessarily
+  // require moderator action to become active. This can be used when the user
+  // signs up with a social login and has the option of setting their own
+  // username.
+  'UNSET',
+
+  // SET is used when the username has been set for the first time, but cannot
+  // change without the username being rejected by a moderator and that moderator
+  // agreeing that the username should be allowed to change.
+  'SET',
+
+  // APPROVED is used when the username was changed, and subsequently approved by
+  // said moderator.
+  'APPROVED',
+
+  // REJECTED is used when the username was changed, and subsequently rejected by
+  // said moderator.
+  'REJECTED',
+
+  // CHANGED is used after a user has changed their username after it was
+  // rejected.
+  'CHANGED',
+];
diff --git a/models/user.js b/models/user.js
index 450819d53..a50cffffb 100644
--- a/models/user.js
+++ b/models/user.js
@@ -10,8 +10,9 @@ const can = require('../perms');
 // USER_ROLES is the array of roles that is permissible as a user role.
 const USER_ROLES = require('./enum/user_roles');
 
-// USER_STATUS is the list of statuses that are permitted for the user status.
-const USER_STATUS = require('./enum/user_status');
+// USER_STATUS_USERNAME is the list of statuses that are supported by storing
+// the username state.
+const USER_STATUS_USERNAME = require('./enum/user_status_username');
 
 // ProfileSchema is the mongoose schema defined as the representation of a
 // User's profile stored in MongoDB.
@@ -73,10 +74,6 @@ const UserSchema = new Schema({
     unique: true
   },
 
-  // This is true when the user account is disabled, no action should be
-  // acknowledged when they are disabled. Logins are also prevented.
-  disabled: Boolean,
-
   // This provides a source of identity proof for users who login using the
   // local provider. A local provider will be assumed for users who do not
   // have any social profiles.
@@ -97,41 +94,85 @@ const UserSchema = new Schema({
     enum: USER_ROLES
   }],
 
-  // Status provides a string that says in which state the account is.
-  // When the account is banned, the user login is disabled.
+  // Status stores the user status information regarding permissions,
+  // capabilities and moderation state.
   status: {
-    type: String,
-    enum: USER_STATUS,
-    default: 'ACTIVE'
-  },
 
-  // Determines whether the user can edit their username.
-  canEditName: {
-    type: Boolean,
-    default: false
-  },
+    // Username stores the current user status for the username as well as the
+    // history of changes.
+    username: {
 
-  // User's suspension details.
-  suspension: {
-    until: {
-      type: Date,
-      default: null,
+      // Status stores the current username status.
+      status: {
+        type: String,
+        enum: USER_STATUS_USERNAME,
+      },
+
+      // History stores the history of username status changes.
+      history: [{
+
+        // Status stores the historical username status.
+        status: {
+          type: String,
+          enum: USER_STATUS_USERNAME,
+        },
+
+        // assigned_by stores the user id of the user who assigned this status.
+        assigned_by: {type: String, default: null},
+
+        // created_at stores the date when this status was assigned.
+        created_at: {type: Date, default: Date.now}
+      }],
     },
-  },
 
-  // User's settings
-  settings: {
-    bio: {
-      type: String,
-      default: ''
+    // Banned stores the current user banned status as well as the history of
+    // changes.
+    banned: {
+
+      // Status stores the current user banned status.
+      status: {
+        type: Boolean,
+        required: true,
+        default: false,
+      },
+      history: [{
+
+        // Status stores the historical banned status.
+        status: Boolean,
+
+        // assigned_by stores the user id of the user who assigned this status.
+        assigned_by: {type: String, default: null},
+
+        // created_at stores the date when this status was assigned.
+        created_at: {type: Date, default: Date.now}
+      }],
+    },
+
+    // Suspension stores the current user suspension status as well as the
+    // history of changes.
+    suspension: {
+
+      // until is the date that the user is suspended until.
+      until: {
+        type: Date,
+        default: null,
+      },
+      history: [{
+
+        // until is the date that the user is suspended until.
+        until: Date,
+
+        // assigned_by stores the user id of the user who assigned this status.
+        assigned_by: {type: String, default: null},
+
+        // created_at stores the date when this status was assigned.
+        created_at: {type: Date, default: Date.now}
+      }]
     }
   },
 
-  ignoresUsers: [{
-
-    // user id of another user
-    type: String,
-  }],
+  // IgnoresUsers is an array of user id's that the current user is ignoring.
+  ignoresUsers: [String],
 
   // Tags are added by the self or by administrators.
   tags: [TagLinkSchema],
@@ -158,7 +199,7 @@ const UserSchema = new Schema({
   }
 });
 
-// Add the indixies on the user profile data.
+// Add the index on the user profile data.
 UserSchema.index({
   'profiles.id': 1,
   'profiles.provider': 1
@@ -201,6 +242,38 @@ UserSchema.method('can', function(...actions) {
   return can(this, ...actions);
 });
 
+/**
+ * banned returns true when the user is currently banned, and sets the banned
+ * status locally.
+ */
+UserSchema.virtual('banned')
+  .get(function() {
+    return this.status.banned.status;
+  })
+  .set(function(status) {
+    this.status.banned.status = status;
+    this.status.banned.history.push({
+      status,
+      created_at: new Date()
+    });
+  });
+
+/**
+ * suspended returns true when the user is currently suspended, and sets the
+ * suspension status locally.
+ */
+UserSchema.virtual('suspended')
+  .get(function() {
+    return Boolean(this.status.suspension.until && this.status.suspension.until > new Date());
+  })
+  .set(function(until) {
+    this.status.suspension.until = until;
+    this.status.suspension.history.push({
+      until,
+      created_at: new Date()
+    });
+  });
+
 // Create the User model.
 const UserModel = mongoose.model('User', UserSchema);
 
diff --git a/package.json b/package.json
index 897efc819..01a271bc8 100644
--- a/package.json
+++ b/package.json
@@ -6,43 +6,34 @@
   "private": true,
   "scripts": {
     "postinstall": "./bin/cli plugins reconcile --skip-remote",
-    "start": "./bin/cli serve -j -w",
-    "dev-start": "nodemon -w . -w bin/cli -w bin/cli-serve --config .nodemon.json --exec \"yarn generate-introspection && ./bin/cli -c .env serve -j -w\"",
-    "prebuild": "yarn generate-introspection",
-    "build": "WEBPACK=TRUE NODE_ENV=production webpack -p --config webpack.config.js --bail",
-    "prebuild-watch": "yarn generate-introspection",
-    "build-watch": "WEBPACK=TRUE NODE_ENV=development webpack --progress --config webpack.config.js --watch",
-    "lint": "yamllint locales/*.yml && eslint --ext=.js --ext=.json bin/* .",
-    "lint-fix": "yarn lint --fix",
-    "jest-watch": "TEST_MODE=unit NODE_ENV=test jest --watch",
-    "e2e-ci": "./scripts/e2e-ci.sh",
-    "e2e-browserstack": "NODE_ENV=test ./scripts/e2e-browserstack.js --config nightwatch-browserstack.conf.js",
+    "generate-introspection": "WEBPACK=TRUE NODE_ENV=test ./scripts/generateIntrospectionResult.js",
+    "watch": "npm-run-all generate-introspection --parallel watch:*",
+    "watch:client": "NODE_ENV=development webpack --progress --watch",
+    "watch:server": "nodemon --config .nodemon.json",
+    "start:development": "NODE_ENV=development ./bin/cli -c .env serve -j -w",
+    "start:production": "NODE_ENV=production ./bin/cli serve -j -w",
+    "build": "NODE_ENV=production webpack -p --bail",
+    "lint:yaml": "yamllint locales/*.yml",
+    "lint:js": "eslint --ext=.js --ext=.json bin/* .",
+    "lint": "npm-run-all lint:*",
+    "plugins:reconcile": "./bin/cli plugins reconcile",
+    "test": "npm-run-all test:client test:server",
+    "test:server": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
+    "test:client": "TEST_MODE=unit NODE_ENV=test jest",
+    "test:client:watch": "TEST_MODE=unit NODE_ENV=test jest --watch",
     "pree2e": "selenium-standalone install",
+    "pree2e:ci": "selenium-standalone install",
+    "pree2e:browserstack": "selenium-standalone install",
     "e2e": "NODE_ENV=test nightwatch",
-    "test": "TEST_MODE=unit NODE_ENV=test jest && TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
-    "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec",
-    "heroku-postbuild": "./bin/cli plugins reconcile && yarn build",
-    "generate-introspection": "WEBPACK=TRUE NODE_ENV=test ./scripts/generateIntrospectionResult.js"
+    "e2e:ci": "./scripts/e2e-ci.sh",
+    "e2e:browserstack": "NODE_ENV=test ./scripts/e2e-browserstack.js --config nightwatch-browserstack.conf.js",
+    "heroku-postbuild": "npm-run-all plugins:reconcile build"
   },
   "talk": {
     "migration": {
       "minVersion": 1496771633
     }
   },
-  "config": {
-    "pre-git": {
-      "commit-msg": [],
-      "pre-commit": [
-        "yarn lint",
-        "yarn test"
-      ],
-      "pre-push": [
-        "yarn test"
-      ],
-      "post-commit": [],
-      "post-merge": []
-    }
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/coralproject/talk.git"
@@ -122,7 +113,6 @@
     "imports-loader": "^0.7.1",
     "inquirer": "^3.2.2",
     "ioredis": "3.1.4",
-    "istanbul": "^1.1.0-alpha.1",
     "joi": "^10.6.0",
     "json-loader": "^0.5.7",
     "jsonwebtoken": "^7.4.3",
@@ -144,6 +134,7 @@
     "node-emoji": "^1.8.1",
     "node-fetch": "^1.7.2",
     "nodemailer": "^2.6.4",
+    "npm-run-all": "^4.1.1",
     "passport": "^0.4.0",
     "passport-jwt": "^3.0.0",
     "passport-local": "^1.0.0",
@@ -172,7 +163,6 @@
     "redux": "^3.6.0",
     "redux-thunk": "^2.1.0",
     "resolve": "^1.4.0",
-    "selenium-standalone": "^6.11.0",
     "semver": "^5.4.1",
     "simplemde": "^1.11.2",
     "smoothscroll-polyfill": "^0.3.5",
@@ -199,6 +189,7 @@
     "browserstack-local": "^1.3.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
+    "chai-datetime": "^1.5.0",
     "chai-http": "^3.0.0",
     "enzyme": "^3.0.0",
     "enzyme-adapter-react-15": "^1.0.0",
@@ -210,16 +201,12 @@
     "mocha-junit-reporter": "^1.12.1",
     "nightwatch": "^0.9.16",
     "nodemon": "^1.11.0",
-    "pre-git": "^3.15.3",
+    "selenium-standalone": "^6.11.0",
     "sinon": "^3.2.1",
     "sinon-chai": "^2.13.0",
     "yaml-lint": "^1.0.0"
   },
   "engines": {
     "node": "^8"
-  },
-  "release": {
-    "analyzeCommits": "simple-commit-message"
-  },
-  "snyk": true
+  }
 }
diff --git a/perms/constants/mutation.js b/perms/constants/mutation.js
index ce48681f0..6e5d1ac8d 100644
--- a/perms/constants/mutation.js
+++ b/perms/constants/mutation.js
@@ -4,9 +4,9 @@ module.exports = {
   DELETE_ACTION: 'DELETE_ACTION',
   EDIT_NAME: 'EDIT_NAME',
   EDIT_COMMENT: 'EDIT_COMMENT',
-  REJECT_USERNAME: 'REJECT_USERNAME',
-  SET_USER_STATUS: 'SET_USER_STATUS',
-  SUSPEND_USER: 'SUSPEND_USER',
+  SET_USER_USERNAME_STATUS: 'SET_USER_USERNAME_STATUS',
+  SET_USER_BAN_STATUS: 'SET_USER_BAN_STATUS',
+  SET_USER_SUSPENSION_STATUS: 'SET_USER_SUSPENSION_STATUS',
   SET_COMMENT_STATUS: 'SET_COMMENT_STATUS',
   ADD_COMMENT_TAG: 'ADD_COMMENT_TAG',
   REMOVE_COMMENT_TAG: 'REMOVE_COMMENT_TAG',
diff --git a/perms/reducers/index.js b/perms/reducers/index.js
index 312a79008..70761990d 100644
--- a/perms/reducers/index.js
+++ b/perms/reducers/index.js
@@ -5,16 +5,13 @@ const subscription = require('./subscription');
 module.exports = [
   (user /* , perm*/) => {
 
-    // this runs before everything
-    if (
-      user.status === 'BANNED' ||
-        (user.suspension.until && user.suspension.until > new Date())
-    ) {
+    // If a user is banned or currently suspended, then they aren't allowed to
+    // do anything.
+    if (user.banned || user.suspended) {
       return false;
     }
   },
   query,
   mutation,
   subscription,
-]
-;
\ No newline at end of file
+];
diff --git a/perms/reducers/mutation.js b/perms/reducers/mutation.js
index 9621ffe00..ecd08980f 100644
--- a/perms/reducers/mutation.js
+++ b/perms/reducers/mutation.js
@@ -8,23 +8,29 @@ module.exports = (user, perm) => {
   case types.DELETE_ACTION:
   case types.EDIT_NAME:
   case types.EDIT_COMMENT:
+
+    // Anyone can do these things if they aren't suspended or banned.
     return true;
+
   case types.ADD_COMMENT_TAG:
   case types.REMOVE_COMMENT_TAG:
     return check(user, ['ADMIN', 'MODERATOR', 'STAFF']);
+
   case types.UPDATE_USER_ROLES:
-  case types.REJECT_USERNAME:
-  case types.SET_USER_STATUS:
-  case types.SUSPEND_USER:
   case types.SET_COMMENT_STATUS:
+  case types.SET_USER_USERNAME_STATUS:
+  case types.SET_USER_BAN_STATUS:
+  case types.SET_USER_SUSPENSION_STATUS:
   case types.UPDATE_CONFIG:
   case types.UPDATE_SETTINGS:
   case types.UPDATE_ASSET_SETTINGS:
   case types.UPDATE_ASSET_STATUS:
     return check(user, ['ADMIN', 'MODERATOR']);
+
   case types.CREATE_TOKEN:
   case types.REVOKE_TOKEN:
     return check(user, ['ADMIN']);
+
   default:
     break;
   }
diff --git a/perms/reducers/query.js b/perms/reducers/query.js
index 43ae3c05f..395bad83f 100644
--- a/perms/reducers/query.js
+++ b/perms/reducers/query.js
@@ -4,25 +4,19 @@ const types = require('../constants');
 module.exports = (user, perm) => {
   switch (perm) {
   case types.SEARCH_ASSETS:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SEARCH_OTHER_USERS:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SEARCH_ACTIONS:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SEARCH_NON_NULL_OR_ACCEPTED_COMMENTS:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SEARCH_OTHERS_COMMENTS:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SEARCH_COMMENT_METRICS:
-    return check(user, ['ADMIN', 'MODERATOR']);
-  case types.LIST_OWN_TOKENS:
-    return check(user, ['ADMIN']);
   case types.SEARCH_COMMENT_STATUS_HISTORY:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.VIEW_SUSPENSION_INFO:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.VIEW_PROTECTED_SETTINGS:
     return check(user, ['ADMIN', 'MODERATOR']);
+
+  case types.LIST_OWN_TOKENS:
+    return check(user, ['ADMIN']);
+
   default:
     break;
   }
diff --git a/perms/reducers/subscription.js b/perms/reducers/subscription.js
index 9ebde3000..65d93e61b 100644
--- a/perms/reducers/subscription.js
+++ b/perms/reducers/subscription.js
@@ -4,21 +4,15 @@ const types = require('../constants');
 module.exports = (user, perm) => {
   switch (perm) {
   case types.SUBSCRIBE_COMMENT_FLAGGED:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_COMMENT_ACCEPTED:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_COMMENT_REJECTED:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_ALL_COMMENT_EDITED:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_ALL_COMMENT_ADDED:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_ALL_USER_SUSPENDED:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_ALL_USER_BANNED:
-    return check(user, ['ADMIN', 'MODERATOR']);
   case types.SUBSCRIBE_ALL_USERNAME_REJECTED:
     return check(user, ['ADMIN', 'MODERATOR']);
+
   default:
     break;
   }
diff --git a/routes/api/account/index.js b/routes/api/account/index.js
index c35f709cb..de3555725 100644
--- a/routes/api/account/index.js
+++ b/routes/api/account/index.js
@@ -98,13 +98,4 @@ router.put('/password/reset', async (req, res, next) => {
   }
 });
 
-router.put('/username', authorization.needed(), async (req, res, next) => {
-  try {
-    await UsersService.editName(req.user.id, req.body.username);
-    res.status(204).end();
-  } catch (e) {
-    return next(e);
-  }
-});
-
 module.exports = router;
diff --git a/routes/api/users/index.js b/routes/api/users/index.js
index 3199c25ab..a8d55d7ae 100644
--- a/routes/api/users/index.js
+++ b/routes/api/users/index.js
@@ -4,11 +4,7 @@ const UsersService = require('../../../services/users');
 const mailer = require('../../../services/mailer');
 const errors = require('../../../errors');
 const authorization = require('../../../middleware/authorization');
-const i18n = require('../../../services/i18n');
 const Limit = require('../../../services/limit');
-const {
-  ROOT_URL
-} = require('../../../config');
 
 router.get('/', authorization.needed('ADMIN', 'MODERATOR'), async (req, res, next) => {
 
@@ -60,36 +56,6 @@ router.post('/:user_id/role', authorization.needed('ADMIN', 'MODERATOR'), async
   }
 });
 
-// update the status of a user
-router.post('/:user_id/status', authorization.needed('ADMIN', 'MODERATOR'), async (req, res, next) => {
-  let {status} = req.body;
-
-  try {
-    let user = await UsersService.setStatus(req.params.user_id, status);
-    if (!user) {
-      return next(errors.ErrNotFound);
-    }
-
-    if (user.status === 'BANNED') {
-      req.pubsub.publish('userBanned', user);
-    }
-
-    // TODO: investigate why this is returning a value? Also why is this a POST vs PUT?
-    res.status(201).json(user.status);
-  } catch (e) {
-    next(e);
-  }
-});
-
-router.post('/:user_id/username-enable', authorization.needed('ADMIN', 'MODERATOR'), async (req, res, next) => {
-  try {
-    await UsersService.toggleNameEdit(req.params.user_id, true);
-    res.status(204).end();
-  } catch (e) {
-    next(e);
-  }
-});
-
 router.post('/:user_id/email', authorization.needed('ADMIN', 'MODERATOR'), async (req, res, next) => {
   try {
     let user = await UsersService.findById(req.params.user_id);
@@ -114,26 +80,6 @@ router.post('/:user_id/email', authorization.needed('ADMIN', 'MODERATOR'), async
   }
 });
 
-/**
- * SendEmailConfirmation sends a confirmation email to the user.
- * @param {String}     userID  the id for the user to send the email to
- * @param {String}     email   the email for the user to send the email to
- */
-const SendEmailConfirmation = async (user, email, referer) => {
-  let token = await UsersService.createEmailConfirmToken(user, email, referer);
-
-  return mailer.sendSimple({
-    template: 'email-confirm',
-    locals: {
-      token,
-      rootURL: ROOT_URL,
-      email
-    },
-    subject: i18n.t('email.confirm.subject'),
-    to: email
-  });
-};
-
 // create a local user.
 router.post('/', async (req, res, next) => {
   const {email, password, username} = req.body;
@@ -144,7 +90,7 @@ router.post('/', async (req, res, next) => {
 
     // Send an email confirmation. The Front end will know about the
     // requireEmailConfirmation as it's included in the settings get endpoint.
-    await SendEmailConfirmation(user, email, redirectUri);
+    await UsersService.sendEmailConfirmation(user, email, redirectUri);
 
     res.status(201).json(user);
   } catch (e) {
@@ -152,26 +98,6 @@ router.post('/', async (req, res, next) => {
   }
 });
 
-router.post('/:user_id/actions', authorization.needed(), async (req, res, next) => {
-  const {
-    action_type,
-    metadata
-  } = req.body;
-
-  try {
-    let action = await UsersService.addAction(req.params.user_id, req.user.id, action_type, metadata);
-
-    // Set the user status to "pending" for review by moderators
-    if (action_type === 'FLAG') {
-      await UsersService.setStatus(req.params.user_id, 'PENDING');
-    }
-
-    res.status(201).json(action);
-  } catch (e) {
-    return next(e);
-  }
-});
-
 // This will allow 1 try every minute.
 const resendRateLimiter = new Limit('/api/v1/users/resend-verify', 1, '1m');
 
@@ -205,7 +131,7 @@ router.post('/resend-verify', async (req, res, next) => {
       throw errors.ErrNotFound;
     }
 
-    await SendEmailConfirmation(user, email, redirectUri);
+    await UsersService.sendEmailConfirmation(user, email, redirectUri);
 
     res.status(204).end();
   } catch (e) {
@@ -234,7 +160,7 @@ router.post('/:user_id/email/confirm', authorization.needed('ADMIN', 'MODERATOR'
     }
 
     // Send the email to the first local profile that was found.
-    await SendEmailConfirmation(user, localProfile.id);
+    await UsersService.sendEmailConfirmation(user, localProfile.id);
 
     res.status(204).end();
   } catch (e) {
diff --git a/routes/index.js b/routes/index.js
index 23e8d8a47..848269a4d 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -12,6 +12,7 @@ const {createGraphOptions} = require('../graph');
 const accepts = require('accepts');
 const apollo = require('graphql-server-express');
 const {DISABLE_STATIC_SERVER} = require('../config');
+const SetupService = require('../services/setup');
 
 const router = express.Router();
 
@@ -19,29 +20,29 @@ const router = express.Router();
 // STATIC FILES
 //==============================================================================
 
-// If the application is in production mode, then add gzip rewriting for the
-// content.
-if (process.env.NODE_ENV === 'production') {
-  router.get('*.js', (req, res, next) => {
-    const accept = accepts(req);
-    if (accept.encoding(['gzip']) === 'gzip') {
-
-      // Adjsut the headers on the request by adding a content type header
-      // because express won't be able to detect the mime-type with the .gz
-      // extension and we need to decalre support for the gzip encoding.
-      res.set('Content-Type', 'application/javascript');
-      res.set('Content-Encoding', 'gzip');
-
-      // Rewrite the url so that the gzip version will be served instead.
-      req.url = `${req.url}.gz`;
-    }
-
-    next();
-  });
-}
-
 if (!DISABLE_STATIC_SERVER) {
 
+  // If the application is in production mode, then add gzip rewriting for the
+  // content.
+  if (process.env.NODE_ENV === 'production') {
+    router.get('*.js', (req, res, next) => {
+      const accept = accepts(req);
+      if (accept.encoding(['gzip']) === 'gzip') {
+
+      // Adjust the headers on the request by adding a content type header
+      // because express won't be able to detect the mime-type with the .gz
+      // extension and we need to declare support for the gzip encoding.
+        res.set('Content-Type', 'application/javascript');
+        res.set('Content-Encoding', 'gzip');
+
+        // Rewrite the url so that the gzip version will be served instead.
+        req.url = `${req.url}.gz`;
+      }
+
+      next();
+    });
+  }
+
   /**
    * Serve the directories under public/dist from this router.
    */
@@ -100,7 +101,7 @@ if (process.env.NODE_ENV !== 'production') {
     });
   });
 
-  // GraphQL documention.
+  // GraphQL documentation.
   router.get('/admin/docs', (req, res) => {
     res.render('admin/docs');
   });
@@ -118,14 +119,28 @@ router.use('/embed', require('./embed'));
 if (process.env.NODE_ENV !== 'production') {
   router.use('/assets', require('./assets'));
 
-  router.get('/', (req, res) => {
-    return res.render('article', {
-      title: 'Coral Talk',
-      asset_url: '',
-      asset_id: '',
-      body: '',
-      basePath: '/client/embed/stream'
-    });
+  router.get('/', async (req, res) => {
+    try {
+      await SetupService.isAvailable();
+      return res.redirect('/admin/install');
+    } catch (e) {
+      return res.render('article', {
+        title: 'Coral Talk',
+        asset_url: '',
+        asset_id: '',
+        body: '',
+        basePath: '/client/embed/stream'
+      });
+    }
+  });
+} else {
+  router.get('/', async (req, res, next) => {
+    try {
+      await SetupService.isAvailable();
+      return res.redirect('/admin/install');
+    } catch (e) {
+      return res.redirect('/admin');
+    }
   });
 }
 
diff --git a/scripts/e2e-ci.sh b/scripts/e2e-ci.sh
index e72d1a6ce..70d423429 100755
--- a/scripts/e2e-ci.sh
+++ b/scripts/e2e-ci.sh
@@ -29,7 +29,7 @@ if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
 
     echo "-- Start e2e for $1 #$try --"
 
-    REPORTS_FOLDER="$CIRCLE_TEST_REPORTS/$1" yarn e2e-browserstack --env "$1"
+    REPORTS_FOLDER="$CIRCLE_TEST_REPORTS/$1" yarn test:e2e:browserstack --env "$1"
 
     # Determine exit code.
     result=$?
@@ -85,7 +85,7 @@ if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
   exit $exitCode
 else
   # When browserstack is not available test locally using chrome headless.
-  REPORTS_FOLDER="$CIRCLE_TEST_REPORTS/chrome" yarn e2e -- --env chrome-headless
+  REPORTS_FOLDER="$CIRCLE_TEST_REPORTS/chrome" yarn test:e2e --env chrome-headless
 
   # Will exit with status of last command.
   exit $?
diff --git a/serve.js b/serve.js
index e97095d52..52b0bdf68 100644
--- a/serve.js
+++ b/serve.js
@@ -82,7 +82,7 @@ async function onListening() {
   let bind = typeof addr === 'string'
     ? `pipe ${addr}`
     : `port ${addr.port}`;
-  debug(`API Server Listening on ${bind}`);
+  console.log(`API Server Listening on ${bind}`);
 }
 
 /**
@@ -141,7 +141,7 @@ async function serve({jobs = true, websockets = true} = {}) {
 
     // Mount the websocket server if requested.
     if (websockets) {
-      debug(`Websocket Server Listening on ${port}`);
+      console.log(`Websocket Server Listening on ${port}`);
 
       // Mount the subscriptions server on the application server.
       createSubscriptionManager(server);
diff --git a/services/assets.js b/services/assets.js
index 4aac2addd..5a4a2cb4a 100644
--- a/services/assets.js
+++ b/services/assets.js
@@ -1,7 +1,7 @@
 const CommentModel = require('../models/comment');
 const AssetModel = require('../models/asset');
 const SettingsService = require('./settings');
-const domainlist = require('./domainlist');
+const DomainList = require('./domain_list');
 const errors = require('../errors');
 const merge = require('lodash/merge');
 
@@ -64,7 +64,7 @@ module.exports = class AssetsService {
 
     // Check the URL to confirm that is in the domain whitelist
     return Promise.all([
-      domainlist.urlCheck(url),
+      DomainList.urlCheck(url),
       SettingsService.retrieve()
     ]).then(([whitelisted, settings]) => {
 
diff --git a/services/domainlist.js b/services/domain_list.js
similarity index 85%
rename from services/domainlist.js
rename to services/domain_list.js
index a75d62dca..f5ee1e339 100644
--- a/services/domainlist.js
+++ b/services/domain_list.js
@@ -1,4 +1,4 @@
-const debug = require('debug')('talk:services:domainlist');
+const debug = require('debug')('talk:services:domain_list');
 const _ = require('lodash');
 const SettingsService = require('./settings');
 
@@ -8,7 +8,7 @@ const {ROOT_URL} = require('../config');
  * The root domainlist object.
  * @type {Object}
  */
-class Domainlist {
+class DomainList {
 
   constructor() {
     this.lists = {
@@ -35,7 +35,7 @@ class Domainlist {
       return;
     }
 
-    this.lists.whitelist = Domainlist.parseList(lists.whitelist);
+    this.lists.whitelist = DomainList.parseList(lists.whitelist);
     debug(`Added ${lists.whitelist.length} domains to the whitelist.`);
   }
 
@@ -47,7 +47,7 @@ class Domainlist {
   match(list, url) {
 
     // Parse the url that we're matching with.
-    const domainToMatch = Domainlist.parseURL(url);
+    const domainToMatch = DomainList.parseURL(url);
 
     // This will return true in the event that at least one blockword is found
     // in the phrase.
@@ -61,7 +61,7 @@ class Domainlist {
    * @returns {Boolean} true if the domains match
    */
   static matchMount(url) {
-    return Domainlist.parseURL(url) === Domainlist.parseURL(ROOT_URL);
+    return DomainList.parseURL(url) === DomainList.parseURL(ROOT_URL);
   }
 
   /**
@@ -70,7 +70,7 @@ class Domainlist {
    * @return {Array}      the parsed list
    */
   static parseList(list) {
-    return _.uniq(list.map((domain) => Domainlist.parseURL(domain)));
+    return _.uniq(list.map((domain) => DomainList.parseURL(domain)));
   }
 
   /**
@@ -95,7 +95,7 @@ class Domainlist {
   }
 
   static async urlCheck(url) {
-    const dl = new Domainlist();
+    const dl = new DomainList();
 
     // Load the domain list.
     await dl.load();
@@ -106,4 +106,4 @@ class Domainlist {
 
 }
 
-module.exports = Domainlist;
+module.exports = DomainList;
diff --git a/services/users.js b/services/users.js
index e0f7d1599..0ecf35582 100644
--- a/services/users.js
+++ b/services/users.js
@@ -1,4 +1,3 @@
-const assert = require('assert');
 const uuid = require('uuid');
 const bcrypt = require('bcryptjs');
 const errors = require('../errors');
@@ -15,7 +14,6 @@ const {
 const debug = require('debug')('talk:services:users');
 
 const UserModel = require('../models/user');
-const USER_STATUS = require('../models/enum/user_status');
 const USER_ROLES = require('../models/enum/user_roles');
 
 const RECAPTCHA_WINDOW = '10m'; // 10 minutes.
@@ -23,8 +21,9 @@ const RECAPTCHA_INCORRECT_TRIGGER = 5; // after 3 incorrect attempts, recaptcha
 
 const ActionsService = require('./actions');
 const MailerService = require('./mailer');
+const i18n = require('./i18n');
 const Wordlist = require('./wordlist');
-const Domainlist = require('./domainlist');
+const DomainList = require('./domain_list');
 const {escapeRegExp} = require('./regex');
 
 const EMAIL_CONFIRM_JWT_SUBJECT = 'email_confirm';
@@ -181,13 +180,40 @@ module.exports = class UsersService {
           lowercaseUsername: username.toLowerCase(),
           roles: [],
           profiles: [{id, provider}],
-          canEditName: true
+          status: {
+            username: {
+              status: 'UNSET',
+              history: {
+                status: 'UNSET'
+              }
+            }
+          }
         });
 
         return user.save();
       });
   }
 
+  /**
+   * sendEmailConfirmation sends a confirmation email to the user.
+   * @param {String}     user  the user to send the email to
+   * @param {String}     email   the email for the user to send the email to
+   */
+  static async sendEmailConfirmation(user, email, redirectURI = ROOT_URL) {
+    let token = await UsersService.createEmailConfirmToken(user, email, redirectURI);
+
+    return MailerService.sendSimple({
+      template: 'email-confirm',
+      locals: {
+        token,
+        rootURL: ROOT_URL,
+        email
+      },
+      subject: i18n.t('email.confirm.subject'),
+      to: email
+    });
+  }
+
   static async changePassword(id, password) {
     const hashedPassword = await bcrypt.hash(password, SALT_ROUNDS);
 
@@ -289,7 +315,15 @@ module.exports = class UsersService {
           id: email,
           provider: 'local'
         }
-      ]
+      ],
+      status: {
+        username: {
+          status: 'SET',
+          history: {
+            status: 'SET'
+          }
+        }
+      }
     });
 
     try {
@@ -307,36 +341,6 @@ module.exports = class UsersService {
     return user;
   }
 
-  /**
-   * Disables a given user account.
-   * @param  {String}   id   id of a user
-   * @param  {Function} done callback after the operation is complete
-   */
-  static disableUser(id) {
-    return UserModel.update({
-      id
-    }, {
-      $set: {
-        disabled: true
-      }
-    });
-  }
-
-  /**
-   * Enables a given user account.
-   * @param  {String}   id   id of a user
-   * @param  {Function} done callback after the operation is complete
-   */
-  static enableUser(id) {
-    return UserModel.update({
-      id
-    }, {
-      $set: {
-        disabled: false
-      }
-    });
-  }
-
   /**
    * Adds a role to a user.
    * @param  {String}   id   id of a user
@@ -380,131 +384,6 @@ module.exports = class UsersService {
     });
   }
 
-  /**
-   * Set status of a user.
-   * @param  {String}   id   id of a user
-   * @param  {String}   status status to set
-   * @param  {Function} done callback after the operation is complete
-   */
-  static async setStatus(id, status) {
-
-    // Check to see if the user status is in the allowable set of roles.
-    if (USER_STATUS.indexOf(status) === -1) {
-
-      // User status is not supported! Error out here.
-      throw new Error(`status ${status} is not supported`);
-    }
-
-    // TODO: current updating status behavior is weird.
-    // once a user has been `APPROVED` its status cannot be
-    // changed anymore.
-    const user = await UserModel.findOneAndUpdate({
-      id,
-      status: {
-        $ne: 'APPROVED'
-      }
-    }, {
-      $set: {
-        status
-      }
-    }, {
-      new: true,
-    });
-
-    if (status === 'BANNED') {
-      let localProfile = user.profiles.find((profile) => profile.provider === 'local');
-      if (localProfile) {
-        const options =
-          {
-            template: 'banned',              // needed to know which template to render!
-            locals: {                            // specifies the template locals.
-              body: 'In accordance with The Coral Project’s community guidelines, your account has been banned. You are now longer allowed to comment, flag or engage with our community.'
-            },
-            subject: 'Your account has been banned',
-            to: localProfile.id  // This only works if the user has registered via e-mail.
-            // We may want a standard way to access a user's e-mail address in the future
-          };
-        await MailerService.sendSimple(options);
-      }
-
-    }
-    return user;
-  }
-
-  /**
-   * Suspend a user until specified time.
-   * @param  {String}   id                  id of a user
-   * @param  {String}   message             message to be send to the user
-   * @param  {Date}     until               date until the suspension is valid.
-   */
-  static async suspendUser(id, message, until) {
-    const user = await UserModel.findOneAndUpdate({id}, {
-      $set: {
-        suspension: {
-          until,
-        },
-      }
-    }, {
-      new: true,
-    });
-
-    if (message) {
-      let localProfile = user.profiles.find((profile) => profile.provider === 'local');
-      if (localProfile) {
-        const options =
-          {
-            template: 'suspension',              // needed to know which template to render!
-            locals: {                            // specifies the template locals.
-              body: message
-            },
-            subject: 'Your account has been suspended',
-            to: localProfile.id  // This only works if the user has registered via e-mail.
-            // We may want a standard way to access a user's e-mail address in the future
-          };
-
-        await MailerService.sendSimple(options);
-      }
-    }
-
-    return user;
-  }
-
-  /**
-   * Reject username. It changes the status to BANNED and canEditName to True.
-   * @param  {String}   id                  id of a user
-   * @param  {String}   message             message to be send to the user
-   * @param  {Date}     until               date until the suspension is valid.
-   */
-  static async rejectUsername(id, message) {
-    const user = await UserModel.findOneAndUpdate({id}, {
-      $set: {
-        status: 'BANNED',
-        canEditName: true,
-      }
-    }, {
-      new: true,
-    });
-
-    if (message) {
-      let localProfile = user.profiles.find(({provider}) => provider === 'local');
-      if (localProfile) {
-        const options = {
-          template: 'suspension',              // needed to know which template to render!
-          locals: {                            // specifies the template locals.
-            body: message
-          },
-          subject: 'Email Suspension',
-          to: localProfile.id  // This only works if the user has registered via e-mail.
-          // We may want a standard way to access a user's e-mail address in the future
-        };
-
-        await MailerService.sendSimple(options);
-      }
-    }
-
-    return user;
-  }
-
   /**
    * Finds a user with the id.
    * @param {String} id  user id (uuid)
@@ -567,7 +446,7 @@ module.exports = class UsersService {
 
     const [user, domainValidated] = await Promise.all([
       UserModel.findOne({profiles: {$elemMatch: {id: email}}}),
-      Domainlist.urlCheck(loc),
+      DomainList.urlCheck(loc),
     ]);
     if (!user) {
 
@@ -579,7 +458,7 @@ module.exports = class UsersService {
 
     // If the domain didn't match any of the whitelisted domains and if it
     // didn't match the mount domain, then throw an error.
-    if (!domainValidated && !Domainlist.matchMount(loc)) {
+    if (!domainValidated && !DomainList.matchMount(loc)) {
       throw new Error('user supplied location exists on non-permitted domain');
     }
 
@@ -727,7 +606,7 @@ module.exports = class UsersService {
    */
   static async createEmailConfirmToken(user, email, referer = ROOT_URL) {
     if (!email || typeof email !== 'string') {
-      throw new Error('email is required when creating a JWT for resetting passord');
+      throw new Error('email is required when creating a JWT for resetting password');
     }
 
     // Conform the email to lowercase.
@@ -791,97 +670,12 @@ module.exports = class UsersService {
       });
   }
 
-  /**
-   * Returns all users with pending 'ADMIN'ation actions.
-   * @return {Promise}
-   */
-  static moderationQueue() {
-    return UserModel.find({status: 'PENDING'});
-  }
-
-  /**
-   * Gives the user the ability to edit their username.
-   * @param  {String} id the id of the user to be toggled.
-   * @param  {Boolean} canEditName sets whether the user can edit their name.
-   * @return {Promise}
-   */
-  static toggleNameEdit(id, canEditName) {
-    return UserModel.update({id}, {
-      $set: {canEditName}
-    });
-  }
-
-  /**
-   * Updates the user's username.
-   * @param  {String} id       The id of the user.
-   * @param  {String} username The new username for the user.
-   * @return {Promise}
-   */
-  static async editName(id, username) {
-
-    // TODO: Revisit this when we revamped User status workflows.
-    const queryUsernameRejected = {
-      id,
-      username: {$ne: username},
-      status: 'BANNED',
-      canEditName: true
-    };
-
-    const queryCreateUsername = {
-      id,
-      status: 'ACTIVE',
-      canEditName: true
-    };
-
-    try {
-      const result = await UserModel.findOneAndUpdate({
-        $or: [queryUsernameRejected, queryCreateUsername],
-      }, {
-        $set: {
-          username: username,
-          lowercaseUsername: username.toLowerCase(),
-          canEditName: false,
-          status: 'PENDING',
-        }
-      }, {
-        new: true,
-      });
-
-      if (!result) {
-        const user = await UsersService.findById(id);
-        if (user === null) {
-          throw errors.ErrNotFound;
-        }
-
-        if (!user.canEditName) {
-          throw errors.ErrPermissionUpdateUsername;
-        }
-
-        if (user.username === username) {
-          throw errors.ErrSameUsernameProvided;
-        }
-
-        throw new Error('edit username failed for an unexpected reason');
-      }
-
-      return result;
-    }
-    catch(err) {
-      if (err.code === 11000) {
-        throw errors.ErrUsernameTaken;
-      }
-      throw err;
-    }
-  }
-
   /**
    * Ignore another user
    * @param  {String} id the id of the user that is ignoring another users
    * @param  {Array<String>} usersToIgnore Array of user IDs to ignore
    */
   static async ignoreUsers(id, usersToIgnore) {
-    assert(Array.isArray(usersToIgnore), 'usersToIgnore is an array');
-    assert(usersToIgnore.every((u) => typeof u === 'string'), 'usersToIgnore is an array of string user IDs');
     if (usersToIgnore.includes(id)) {
       throw new Error('Users cannot ignore themselves');
     }
@@ -891,7 +685,6 @@ module.exports = class UsersService {
       throw errors.ErrCannotIgnoreStaff;
     }
 
-    // TODO: For each usersToIgnore, make sure they exist?
     return UserModel.update({id}, {
       $addToSet:  {
         ignoresUsers: {
@@ -907,8 +700,6 @@ module.exports = class UsersService {
    * @param  {Array<String>} usersToStopIgnoring Array of user IDs to stop ignoring
    */
   static async stopIgnoringUsers(id, usersToStopIgnoring) {
-    assert(Array.isArray(usersToStopIgnoring), 'usersToStopIgnoring is an array');
-    assert(usersToStopIgnoring.every((u) => typeof u === 'string'), 'usersToStopIgnoring is an array of string user IDs');
     await UserModel.update({id}, {
       $pullAll:  {
         ignoresUsers: usersToStopIgnoring
diff --git a/test/helpers/mongoose.js b/test/helpers/mongoose.js
index 53c373b60..5525f2ec1 100644
--- a/test/helpers/mongoose.js
+++ b/test/helpers/mongoose.js
@@ -26,7 +26,6 @@ beforeEach(async () => {
   }));
 });
 
-after(function(done) {
+after(async function() {
   mongoose.disconnect();
-  done();
 });
diff --git a/test/helpers/rejection.js b/test/helpers/rejection.js
new file mode 100644
index 000000000..044d893f0
--- /dev/null
+++ b/test/helpers/rejection.js
@@ -0,0 +1,3 @@
+process.on('unhandledRejection', function(reason, promise) {
+  console.error(promise);
+});
diff --git a/test/server/graph/mutations/addTag.js b/test/server/graph/mutations/addTag.js
index 52f20b065..2481360ad 100644
--- a/test/server/graph/mutations/addTag.js
+++ b/test/server/graph/mutations/addTag.js
@@ -48,7 +48,7 @@ describe('graph.mutations.addTag', () => {
     Object.entries({
       'anonymous': undefined,
       'regular commenter': new UserModel({}),
-      'banned moderator': new UserModel({roles: ['MODERATOR'], status: 'BANNED'})
+      'banned moderator': new UserModel({roles: ['MODERATOR'], banned: true})
     }).forEach(([ userDescription, user ]) => {
       it(userDescription, async () => {
         const context = new Context({user});
diff --git a/test/server/graph/mutations/createComment.js b/test/server/graph/mutations/createComment.js
index 9583c2066..2aa04527a 100644
--- a/test/server/graph/mutations/createComment.js
+++ b/test/server/graph/mutations/createComment.js
@@ -71,27 +71,28 @@ describe('graph.mutations.createComment', () => {
     beforeEach(() => AssetModel.create({id: '123'}));
 
     [
-      {user: new UserModel({status: 'ACTIVE'}), error: null},
-      {user: new UserModel({status: 'BANNED'}), error: 'NOT_AUTHORIZED'},
-      {user: new UserModel({status: 'PENDING'}), error: null},
-      {user: new UserModel({status: 'APPROVED'}), error: null}
+      {user: new UserModel({}), error: null},
+      {user: new UserModel({banned: true}), error: 'NOT_AUTHORIZED'},
+      {user: new UserModel({suspended: new Date((new Date()).getTime() - (10 * 86400000))}), error: null},
+      {user: new UserModel({suspended: new Date((new Date()).getTime() + (10 * 86400000))}), error: 'NOT_AUTHORIZED'},
     ].forEach(({user, error}) => {
-      describe(`user.status=${user.status}`, () => {
-        it(error ? 'does not create the comment' : 'creates the comment', () => {
+      describe(`user.banned=${user.banned} user.suspended=${user.suspended}`, () => {
+        it(error ? 'does not create the comment' : 'creates the comment', async () => {
           const context = new Context({user});
+          const {data, errors} = await graphql(schema, query, {}, context);
 
-          return graphql(schema, query, {}, context)
-            .then(({data, errors}) => {
-              expect(errors).to.be.undefined;
-              if (error) {
-                expect(data.createComment).to.have.property('comment').null;
-                expect(data.createComment).to.have.property('errors').not.null;
-                expect(data.createComment.errors[0]).to.have.property('translation_key', error);
-              } else {
-                expect(data.createComment).to.have.property('comment').not.null;
-                expect(data.createComment).to.have.property('errors').null;
-              }
-            });
+          expect(errors).to.be.undefined;
+          if (error) {
+            expect(data.createComment).to.have.property('comment').null;
+            expect(data.createComment).to.have.property('errors').not.null;
+            expect(data.createComment.errors[0]).to.have.property('translation_key', error);
+          } else {
+            if (data.createComment.errors && data.createComment.errors.length > 0) {
+              console.error(data.createComment.errors);
+            }
+            expect(data.createComment).to.have.property('errors').null;
+            expect(data.createComment).to.have.property('comment').not.null;
+          }
         });
       });
     });
@@ -109,7 +110,7 @@ describe('graph.mutations.createComment', () => {
         beforeEach(() => asset.save());
 
         it(error ? 'does not create the comment' : 'creates the comment', () => {
-          const context = new Context({user: new UserModel({status: 'ACTIVE'})});
+          const context = new Context({user: new UserModel({})});
 
           return graphql(schema, query, {}, context)
             .then(({data, errors}) => {
@@ -142,7 +143,7 @@ describe('graph.mutations.createComment', () => {
         beforeEach(() => AssetModel.create({id: '123', settings: {moderation}}));
 
         it(`creates comment with status=${status}`, () => {
-          const context = new Context({user: new UserModel({status: 'ACTIVE'})});
+          const context = new Context({user: new UserModel()});
 
           return graphql(schema, query, {}, context)
             .then(({data, errors}) => {
@@ -172,33 +173,30 @@ describe('graph.mutations.createComment', () => {
     ].forEach(({message, body, status, flagged}) => {
       describe(message, () => {
 
-        it(`should create a comment with status=${status} and it ${flagged ? 'should' : 'should not'} be flagged`, () => {
-          const context = new Context({user: new UserModel({status: 'ACTIVE'})});
+        it(`should create a comment with status=${status} and it ${flagged ? 'should' : 'should not'} be flagged`, async () => {
+          const context = new Context({user: new UserModel({})});
 
-          return graphql(schema, query, {}, context, {
+          const {data, errors} = await graphql(schema, query, {}, context, {
             input: {
               asset_id: '123',
               body
             }
-          })
-            .then(({data, errors}) => {
-              expect(errors).to.be.undefined;
-              expect(data.createComment).to.have.property('comment').not.null;
-              expect(data.createComment.comment).to.have.property('status', status);
-              expect(data.createComment).to.have.property('errors').null;
+          });
 
-              return ActionModel.find({
-                item_id: data.createComment.comment.id,
-                action_type: 'FLAG'
-              });
-            })
-            .then((actions) => {
-              if (flagged) {
-                expect(actions).to.have.length(1);
-              } else {
-                expect(actions).to.have.length(0);
-              }
-            });
+          expect(errors).to.be.undefined;
+          expect(data.createComment).to.have.property('comment').not.null;
+          expect(data.createComment.comment).to.have.property('status', status);
+          expect(data.createComment).to.have.property('errors').null;
+
+          const actions = await ActionModel.find({
+            item_id: data.createComment.comment.id,
+            action_type: 'FLAG'
+          });
+          if (flagged) {
+            expect(actions).to.have.length(1);
+          } else {
+            expect(actions).to.have.length(0);
+          }
         });
 
       });
@@ -217,30 +215,26 @@ describe('graph.mutations.createComment', () => {
     ].forEach(({roles, tag}) => {
       describe(`user.roles=${JSON.stringify(roles)}`, () => {
 
-        it(`creates comment ${tag ? `with tag=${tag}` : 'without tags'}`, () => {
+        it(`creates comment ${tag ? `with tag=${tag}` : 'without tags'}`, async () => {
           const context = new Context({user: new UserModel({roles})});
 
-          return graphql(schema, query, {}, context)
-            .then(({data, errors}) => {
-              if (errors) {
-                console.error(errors);
-              }
-              expect(errors).to.be.undefined;
-              expect(data.createComment).to.have.property('comment').not.null;
-              expect(data.createComment).to.have.property('errors').null;
+          const {data, errors} = await graphql(schema, query, {}, context);
 
-              return CommentsService.findById(data.createComment.comment.id);
-            })
-            .then(({tags}) => {
-              if (tag) {
-                expect(tags).to.have.length(1);
-                expect(tags[0].tag.name).to.have.equal(tag);
-              } else {
-                expect(tags).length(0);
-              }
-            });
+          if (errors) {
+            console.error(errors);
+          }
+          expect(errors).to.be.undefined;
+          expect(data.createComment).to.have.property('comment').not.null;
+          expect(data.createComment).to.have.property('errors').null;
+
+          const {tags} = await CommentsService.findById(data.createComment.comment.id);
+          if (tag) {
+            expect(tags).to.have.length(1);
+            expect(tags[0].tag.name).to.have.equal(tag);
+          } else {
+            expect(tags).length(0);
+          }
         });
-
       });
     });
 
diff --git a/test/server/graph/mutations/removeTag.js b/test/server/graph/mutations/removeTag.js
index 761cd44c9..e5c75f2ca 100644
--- a/test/server/graph/mutations/removeTag.js
+++ b/test/server/graph/mutations/removeTag.js
@@ -66,7 +66,7 @@ describe('graph.mutations.removeTag', () => {
     Object.entries({
       'anonymous': undefined,
       'regular commenter': new UserModel({}),
-      'banned moderator': new UserModel({roles: ['MODERATOR'], status: 'BANNED'})
+      'banned moderator': new UserModel({roles: ['MODERATOR'], banned: true})
     }).forEach(([userDescription, user]) => {
       it(userDescription, async function () {
         const context = new Context({user});
diff --git a/test/server/graph/mutations/setUserBanStatus.js b/test/server/graph/mutations/setUserBanStatus.js
new file mode 100644
index 000000000..a59476b9d
--- /dev/null
+++ b/test/server/graph/mutations/setUserBanStatus.js
@@ -0,0 +1,104 @@
+const {graphql} = require('graphql');
+
+const schema = require('../../../../graph/schema');
+const Context = require('../../../../graph/context');
+const SettingsService = require('../../../../services/settings');
+const UserModel = require('../../../../models/user');
+const UsersService = require('../../../../services/users');
+
+const {expect} = require('chai');
+
+describe('graph.mutations.setUserBanStatus', () => {
+  let user;
+  beforeEach(async () => {
+    await SettingsService.init();
+
+    user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+  });
+
+  const setUserBanStatusMutation = `
+    mutation SetUserBanStatus($user_id: ID!, $status: Boolean!) {
+      setUserBanStatus(input: {
+        id: $user_id,
+        status: $status
+      }) {
+        errors {
+          translation_key
+        }
+      }
+    }
+  `;
+
+  [
+    {self: true, error: 'NOT_AUTHORIZED', roles: null},
+    {self: true, error: 'NOT_AUTHORIZED', roles: ['STAFF']},
+    {self: true, error: 'NOT_AUTHORIZED', roles: []},
+    {error: 'NOT_AUTHORIZED', roles: null},
+    {error: 'NOT_AUTHORIZED', roles: ['STAFF']},
+    {error: 'NOT_AUTHORIZED', roles: []},
+    {error: false, roles: ['MODERATOR']},
+    {error: false, roles: ['ADMIN']},
+    {error: false, roles: ['ADMIN', 'MODERATOR']},
+  ].forEach(({self, error, roles}) => {
+    it(`${error ? 'can not' : 'can'} ban ${self ? 'themself' : 'another user'} as a user with roles ${roles && roles.length ? roles : JSON.stringify(roles)}`, async () => {
+      const actor = new UserModel({roles});
+
+      // If we're testing self assign, set the id of the actor to the user
+      // we're acting on.
+      if (self) {
+        actor.id = user.id;
+      }
+
+      const ctx = new Context({user: actor});
+
+      const {data, errors} = await graphql(schema, setUserBanStatusMutation, {}, ctx, {
+        user_id: user.id,
+        status: true
+      });
+
+      if (errors && errors.length > 0) {
+        console.error(errors);
+      }
+      expect(errors).to.be.undefined;
+      if (error) {
+        expect(data.setUserBanStatus).to.have.property('errors').not.null;
+        expect(data.setUserBanStatus.errors[0]).to.have.property('translation_key', error);
+      } else {
+        expect(data.setUserBanStatus).to.be.null;
+
+        user = await UserModel.findOne({id: user.id});
+
+        expect(user.status.banned.status).to.be.true;
+        expect(user.status.banned.history).to.have.length(1);
+        expect(user.status.banned.history[0]).to.have.property('status', true);
+        expect(user.status.banned.history[0]).to.have.property('assigned_by', actor.id);
+        expect(user.status.banned.history[0]).to.have.property('created_at').not.null;
+
+        expect(user.banned).to.be.true;
+
+        const res = await graphql(schema, setUserBanStatusMutation, {}, ctx, {
+          user_id: user.id,
+          status: false
+        });
+        if (res.errors && res.errors.length > 0) {
+          console.error(res.errors);
+        }
+        expect(res.errors).to.be.undefined;
+        expect(res.data.setUserBanStatus).to.be.null;
+
+        user = await UserModel.findOne({id: user.id});
+
+        expect(user.status.banned.status).to.be.false;
+        expect(user.status.banned.history).to.have.length(2);
+        expect(user.status.banned.history[0]).to.have.property('status').to.be.true;
+        expect(user.status.banned.history[0]).to.have.property('assigned_by', actor.id);
+        expect(user.status.banned.history[0]).to.have.property('created_at').not.null;
+        expect(user.status.banned.history[1]).to.have.property('status').to.be.false;
+        expect(user.status.banned.history[1]).to.have.property('assigned_by', actor.id);
+        expect(user.status.banned.history[1]).to.have.property('created_at').not.null;
+
+        expect(user.banned).to.be.false;
+      }
+    });
+  });
+});
diff --git a/test/server/graph/mutations/setUserSuspensionStatus.js b/test/server/graph/mutations/setUserSuspensionStatus.js
new file mode 100644
index 000000000..43d998d4e
--- /dev/null
+++ b/test/server/graph/mutations/setUserSuspensionStatus.js
@@ -0,0 +1,115 @@
+const {graphql} = require('graphql');
+const timekeeper = require('timekeeper');
+
+const schema = require('../../../../graph/schema');
+const Context = require('../../../../graph/context');
+const SettingsService = require('../../../../services/settings');
+const UserModel = require('../../../../models/user');
+const UsersService = require('../../../../services/users');
+
+const chai = require('chai');
+chai.use(require('chai-datetime'));
+const {expect} = chai;
+
+describe('graph.mutations.setUserSuspensionStatus', () => {
+  let user;
+  beforeEach(async () => {
+    await SettingsService.init();
+
+    user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+  });
+
+  const setUserSuspensionStatusMutation = `
+    mutation SetUserUsernameStatus($user_id: ID!, $until: Date) {
+      setUserSuspensionStatus(input: {
+        id: $user_id,
+        until: $until
+      }) {
+        errors {
+          translation_key
+        }
+      }
+    }
+  `;
+
+  [
+    {self: true, error: 'NOT_AUTHORIZED', roles: null},
+    {self: true, error: 'NOT_AUTHORIZED', roles: ['STAFF']},
+    {self: true, error: 'NOT_AUTHORIZED', roles: []},
+    {error: 'NOT_AUTHORIZED', roles: null},
+    {error: 'NOT_AUTHORIZED', roles: ['STAFF']},
+    {error: 'NOT_AUTHORIZED', roles: []},
+    {error: false, roles: ['MODERATOR']},
+    {error: false, roles: ['ADMIN']},
+    {error: false, roles: ['ADMIN', 'MODERATOR']},
+  ].forEach(({self, error, roles}) => {
+    it(`${error ? 'can not' : 'can'} suspend ${self ? 'themself' : 'another user'} as a user with roles ${roles && roles.length ? roles : JSON.stringify(roles)}`, async () => {
+      const actor = new UserModel({roles});
+
+      // If we're testing self assign, set the id of the actor to the user
+      // we're acting on.
+      if (self) {
+        actor.id = user.id;
+      }
+
+      const ctx = new Context({user: actor});
+
+      const now = new Date();
+      const oneHourFromNow = new Date(new Date(now).setHours(now.getHours() + 1));
+
+      const {data, errors} = await graphql(schema, setUserSuspensionStatusMutation, {}, ctx, {
+        user_id: user.id,
+        until: oneHourFromNow
+      });
+
+      if (errors && errors.length > 0) {
+        console.error(errors);
+      }
+      expect(errors).to.be.undefined;
+      if (error) {
+        expect(data.setUserSuspensionStatus).to.have.property('errors').not.null;
+        expect(data.setUserSuspensionStatus.errors[0]).to.have.property('translation_key', error);
+      } else {
+        expect(data.setUserSuspensionStatus).to.be.null;
+
+        user = await UserModel.findOne({id: user.id});
+
+        // Mongoose messes with the date, check within a 2 second window.
+        expect(user.status.suspension.until).to.be.withinTime(new Date(oneHourFromNow.getTime() - 1000), new Date(oneHourFromNow.getTime() + 1000));
+        expect(user.status.suspension.history).to.have.length(1);
+        expect(user.status.suspension.history[0]).to.have.property('until').to.be.withinTime(new Date(oneHourFromNow.getTime() - 1000), new Date(oneHourFromNow.getTime() + 1000));
+        expect(user.status.suspension.history[0]).to.have.property('assigned_by', actor.id);
+        expect(user.status.suspension.history[0]).to.have.property('created_at').not.null;
+
+        expect(user.suspended).to.be.true;
+        timekeeper.travel(new Date(oneHourFromNow.getTime() + 10000));
+        expect(user.suspended).to.be.false;
+        timekeeper.reset();
+
+        const res = await graphql(schema, setUserSuspensionStatusMutation, {}, ctx, {
+          user_id: user.id,
+          until: null
+        });
+        if (res.errors && res.errors.length > 0) {
+          console.error(res.errors);
+        }
+        expect(res.errors).to.be.undefined;
+        expect(res.data.setUserSuspensionStatus).to.be.null;
+
+        user = await UserModel.findOne({id: user.id});
+
+        // Mongoose messes with the date, check within a 2 second window.
+        expect(user.status.suspension.until).to.be.null;
+        expect(user.status.suspension.history).to.have.length(2);
+        expect(user.status.suspension.history[0]).to.have.property('until').to.be.withinTime(new Date(oneHourFromNow.getTime() - 1000), new Date(oneHourFromNow.getTime() + 1000));
+        expect(user.status.suspension.history[0]).to.have.property('assigned_by', actor.id);
+        expect(user.status.suspension.history[0]).to.have.property('created_at').not.null;
+        expect(user.status.suspension.history[1]).to.have.property('until').to.be.null;
+        expect(user.status.suspension.history[1]).to.have.property('assigned_by', actor.id);
+        expect(user.status.suspension.history[1]).to.have.property('created_at').not.null;
+
+        expect(user.suspended).to.be.false;
+      }
+    });
+  });
+});
diff --git a/test/server/graph/mutations/setUserUsernameStatus.js b/test/server/graph/mutations/setUserUsernameStatus.js
new file mode 100644
index 000000000..cc02ac83e
--- /dev/null
+++ b/test/server/graph/mutations/setUserUsernameStatus.js
@@ -0,0 +1,87 @@
+const {graphql} = require('graphql');
+
+const schema = require('../../../../graph/schema');
+const Context = require('../../../../graph/context');
+const SettingsService = require('../../../../services/settings');
+const UserModel = require('../../../../models/user');
+const UsersService = require('../../../../services/users');
+
+const chai = require('chai');
+chai.use(require('chai-datetime'));
+const {expect} = chai;
+
+[
+  {status: 'APPROVED', name: 'approve', mutation: 'approveUsername'},
+  {status: 'REJECTED', name: 'reject', mutation: 'rejectUsername'}
+].forEach(({status, name, mutation}) => {
+  describe(`graph.mutations.${mutation}`, () => {
+    let user;
+    beforeEach(async () => {
+      await SettingsService.init();
+
+      user = await UsersService.createLocalUser('usernameA@example.com', 'password', 'usernameA');
+    });
+
+    const setUserUsernameStatusMutation = `
+    mutation SetUserUsernameStatus($user_id: ID!) {
+      ${mutation}(id: $user_id) {
+        errors {
+          translation_key
+        }
+      }
+    }
+  `;
+
+    [
+      {self: true, error: 'NOT_AUTHORIZED', roles: null},
+      {self: true, error: 'NOT_AUTHORIZED', roles: ['STAFF']},
+      {self: true, error: 'NOT_AUTHORIZED', roles: []},
+      {error: 'NOT_AUTHORIZED', roles: null},
+      {error: 'NOT_AUTHORIZED', roles: ['STAFF']},
+      {error: 'NOT_AUTHORIZED', roles: []},
+      {error: false, roles: ['MODERATOR']},
+      {error: false, roles: ['ADMIN']},
+      {error: false, roles: ['ADMIN', 'MODERATOR']},
+    ].forEach(({self, error, roles}) => {
+      it(`${error ? 'can not' : 'can'} ${name} a username with the user roles ${roles && roles.length ? roles : JSON.stringify(roles)}${self ? ' on themself' : ''}`, async () => {
+        const actor = new UserModel({roles});
+
+        // If we're testing self assign, set the id of the actor to the user
+        // we're acting on.
+        if (self) {
+          actor.id = user.id;
+        }
+
+        const ctx = new Context({user: actor});
+
+        const {data, errors} = await graphql(schema, setUserUsernameStatusMutation, {}, ctx, {
+          user_id: user.id,
+        });
+
+        if (errors && errors.length > 0) {
+          console.error(errors);
+        }
+        expect(errors).to.be.undefined;
+        if (error) {
+          expect(data[mutation]).to.have.property('errors').not.null;
+          expect(data[mutation].errors[0]).to.have.property('translation_key', error);
+        } else {
+          expect(data[mutation]).to.be.null;
+
+          user = await UserModel.findOne({id: user.id});
+
+          expect(user.status.username.status).to.equal(status);
+          expect(user.status.username.history).to.have.length(2);
+          expect(user.status.username.history[0]).to.have.property('status', 'SET');
+          expect(user.status.username.history[0]).to.have.property('assigned_by').is.null;
+          expect(user.status.username.history[0]).to.have.property('created_at').not.null;
+          expect(user.status.username.history[1]).to.have.property('status', status);
+          expect(user.status.username.history[1]).to.have.property('assigned_by', actor.id);
+          expect(user.status.username.history[1]).to.have.property('created_at').not.null;
+
+          expect(user.status.username.history[1].created_at).afterTime(user.status.username.history[0].created_at);
+        }
+      });
+    });
+  });
+});
diff --git a/test/server/graph/mutations/updateAssetSettings.js b/test/server/graph/mutations/updateAssetSettings.js
index 306209c74..64d0b0ffc 100644
--- a/test/server/graph/mutations/updateAssetSettings.js
+++ b/test/server/graph/mutations/updateAssetSettings.js
@@ -22,8 +22,7 @@ describe('graph.mutations.updateAssetSettings', () => {
         translation_key
       }
     }
-  }
-`;
+  }`;
 
   describe('context with different user roles', () => {
 
diff --git a/test/server/graph/mutations/updateSettings.js b/test/server/graph/mutations/updateSettings.js
index 553a2be65..b31b95dc6 100644
--- a/test/server/graph/mutations/updateSettings.js
+++ b/test/server/graph/mutations/updateSettings.js
@@ -21,8 +21,7 @@ describe('graph.mutations.updateSettings', () => {
         translation_key
       }
     }
-  }
-`;
+  }`;
 
   describe('context with different user roles', () => {
 
diff --git a/test/server/routes/api/account/index.js b/test/server/routes/api/account/index.js
deleted file mode 100644
index 83c98de2c..000000000
--- a/test/server/routes/api/account/index.js
+++ /dev/null
@@ -1,57 +0,0 @@
-const passport = require('../../../passport');
-
-const app = require('../../../../../app');
-
-const UsersService = require('../../../../../services/users');
-const SettingsService = require('../../../../../services/settings');
-const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
-
-const chai = require('chai');
-chai.should();
-chai.use(require('chai-http'));
-const expect = chai.expect;
-
-describe('/api/v1/account/username', () => {
-  let mockUser;
-  beforeEach(async () => {
-    await SettingsService.init(settings);
-    mockUser = await UsersService.createLocalUser('ana@gmail.com', '123321123', 'Ana');
-  });
-
-  describe('#put', () => {
-    it('it should enable a user to edit their username if canEditName is enabled', async () => {
-      await chai.request(app)
-        .post(`/api/v1/users/${mockUser.id}/username-enable`)
-        .set(passport.inject({id: '456', roles: ['ADMIN']}));
-
-      const res = await chai.request(app)
-        .put('/api/v1/account/username')
-        .set(passport.inject({id: mockUser.id, roles: []}))
-        .send({username: 'MojoJojo'});
-
-      expect(res).to.have.status(204);
-    });
-
-    it('it should return an error if the wrong user tries to edit a username', async () => {
-      await chai.request(app)
-        .post(`/api/v1/users/${mockUser.id}/username-enable`)
-        .set(passport.inject({id: '456', roles: ['ADMIN']}));
-
-      let res = chai.request(app)
-        .put('/api/v1/account/username')
-        .set(passport.inject({id: 'wrongid', roles: []}))
-        .send({username: 'MojoJojo'});
-
-      return expect(res).to.eventually.be.rejected;
-    });
-
-    it('it should return an error when the user tries to edit their username if canEditName is disabled', () => {
-      let res = chai.request(app)
-        .put('/api/v1/account/username')
-        .set(passport.inject({id: mockUser.id, roles: []}))
-        .send({username: 'MojoJojo'});
-
-      return expect(res).to.eventually.be.rejected;
-    });
-  });
-});
diff --git a/test/server/routes/api/user/index.js b/test/server/routes/api/user/index.js
index 6478956a2..76f144999 100644
--- a/test/server/routes/api/user/index.js
+++ b/test/server/routes/api/user/index.js
@@ -48,52 +48,3 @@ describe('/api/v1/users/:user_id/email/confirm', () => {
     });
   });
 });
-
-describe('/api/v1/users/:user_id/actions', () => {
-
-  let mockUser;
-
-  beforeEach(() => SettingsService.init(settings).then(() => {
-    return UsersService.createLocalUser('ana@gmail.com', '123321123', 'Ana');
-  })
-    .then((user) => {
-      mockUser = user;
-    }));
-
-  describe('#post', () => {
-    it('it should update actions', () => {
-      return chai.request(app)
-        .post(`/api/v1/users/${mockUser.id}/actions`)
-        .set(passport.inject({id: '456', roles: ['ADMIN']}))
-        .send({'action_type': 'FLAG', metadata: {reason: 'Bio is too awesome.'}})
-        .then((res) => {
-          expect(res).to.have.status(201);
-          expect(res).to.have.body;
-          expect(res.body).to.have.property('action_type', 'FLAG');
-          expect(res.body).to.have.property('item_id', mockUser.id);
-        });
-    });
-  });
-});
-
-describe('/api/v1/users/:user_id/username-enable', () => {
-  let mockUser;
-
-  beforeEach(() => SettingsService.init(settings).then(() => {
-    return UsersService.createLocalUser('ana@gmail.com', '123321123', 'Ana');
-  })
-    .then((user) => {
-      mockUser = user;
-    }));
-
-  describe('#post', () => {
-    it('it should enable a user to edit their username', () => {
-      return chai.request(app)
-        .post(`/api/v1/users/${mockUser.id}/username-enable`)
-        .set(passport.inject({id: '456', roles: ['ADMIN']}))
-        .then((res) => {
-          expect(res).to.have.status(204);
-        });
-    });
-  });
-});
diff --git a/test/server/services/domainlist.js b/test/server/services/domain_list.js
similarity index 87%
rename from test/server/services/domainlist.js
rename to test/server/services/domain_list.js
index 33afdda87..b5cfdea5f 100644
--- a/test/server/services/domainlist.js
+++ b/test/server/services/domain_list.js
@@ -1,27 +1,27 @@
 const expect = require('chai').expect;
-const Domainlist = require('../../../services/domainlist');
+const DomainList = require('../../../services/domain_list');
 const SettingsService = require('../../../services/settings');
 
-describe('services.Domainlist', () => {
+describe('services.DomainList', () => {
 
-  const domainlists = {
+  const domainLists = {
     whitelist: [
       'nytimes.com',
       'wapo.com'
     ]
   };
 
-  let domainlist = new Domainlist();
+  let domainList = new DomainList();
   const settings = {id: '1', moderation: 'PRE', domainlist: {whitelist: ['nytimes.com', 'wapo.com']}};
 
   beforeEach(() => SettingsService.init(settings));
 
   describe('#init', () => {
 
-    before(() => domainlist.upsert(domainlists));
+    before(() => domainList.upsert(domainLists));
 
     it('has entries', () => {
-      expect(domainlist.lists.whitelist).to.not.be.empty;
+      expect(domainList.lists.whitelist).to.not.be.empty;
     });
 
   });
@@ -92,21 +92,21 @@ describe('services.Domainlist', () => {
         ['google.Ca:80', 'google.ca'],
         ['google.Ca:443', 'google.ca'],
       ].forEach(([domain, hostname]) => {
-        expect(Domainlist.parseURL(domain), `domain ${domain} should be parsed as ${hostname}`).to.equal(hostname);
+        expect(DomainList.parseURL(domain), `domain ${domain} should be parsed as ${hostname}`).to.equal(hostname);
       });
     });
   });
 
   describe('#match', () => {
 
-    const whiteList = Domainlist.parseList(domainlists['whitelist']);
+    const whiteList = DomainList.parseList(domainLists['whitelist']);
 
     it('does match on an included domain', () => {
       [
         'http://wapo.com',
         'nytimes.com'
       ].forEach((domain) => {
-        expect(domainlist.match(whiteList, domain)).to.be.true;
+        expect(domainList.match(whiteList, domain)).to.be.true;
       });
     });
 
@@ -116,7 +116,7 @@ describe('services.Domainlist', () => {
         'www.badsite.com',
         'otherexample.com'
       ].forEach((domain) => {
-        expect(domainlist.match(whiteList, domain)).to.be.false;
+        expect(domainList.match(whiteList, domain)).to.be.false;
       });
     });
   });
diff --git a/test/server/services/scraper.js b/test/server/services/scraper.js
deleted file mode 100644
index ab2474134..000000000
--- a/test/server/services/scraper.js
+++ /dev/null
@@ -1,22 +0,0 @@
-describe('services.scraper', () => {
-  describe('#create', () => {
-    it('should create a new kue job');
-  });
-
-  describe('#scrape', () => {
-    it('should scrape complete information');
-    it('should scrape what it can');
-  });
-
-  describe('#update', () => {
-    it('should update the database record entries from the meta');
-  });
-
-  describe('#process', () => {
-    it('should start the processor to scrape assets');
-  });
-
-  describe('#shutdown', () => {
-    it('should shutdown the job processor');
-  });
-});
diff --git a/test/server/services/users.js b/test/server/services/users.js
index b4a15e3ba..72914e4c1 100644
--- a/test/server/services/users.js
+++ b/test/server/services/users.js
@@ -151,21 +151,6 @@ describe('services.UsersService', () => {
 
   });
 
-  describe('#setStatus', () => {
-    it('should set the status to active', () => {
-      return UsersService
-        .setStatus(mockUsers[0].id, 'ACTIVE')
-        .then(() => UsersService.findById(mockUsers[0].id))
-        .then((user) => {
-          expect(user).to.have.property('status', 'ACTIVE');
-        })
-        .then(() => {
-          expect(MailerService.sendSimple).to.not.have.been.called;
-        });
-
-    });
-  });
-
   describe('#ignoreUser', () => {
     it('should add user id to ignoredUsers set', async () => {
       const user = mockUsers[0];
@@ -194,54 +179,6 @@ describe('services.UsersService', () => {
     });
   });
 
-  describe('#ban', () => {
-    it('should set the status to banned', () => {
-      return UsersService
-        .setStatus(mockUsers[0].id, 'BANNED')
-        .then(() => UsersService.findById(mockUsers[0].id))
-        .then((user) => {
-          expect(user).to.have.property('status', 'BANNED');
-        })
-        .then(() => {
-          expect(MailerService.sendSimple).to.have.been.calledWithMatch({
-            template: 'banned',
-            to: mockUsers[0].profiles[0].id
-          });
-        });
-    });
-
-    it('should still disable and ban the user if there is no comment', () => {
-      return UsersService
-        .setStatus(mockUsers[0].id, 'BANNED')
-        .then(() => UsersService.findById(mockUsers[0].id))
-        .then((user) => {
-          expect(user).to.have.property('status', 'BANNED');
-        });
-    });
-  });
-
-  describe('#unban', () => {
-    it('should set the status to active', () => {
-      return UsersService
-        .setStatus(mockUsers[0].id, 'ACTIVE')
-        .then(() => UsersService.findById(mockUsers[0].id))
-        .then((user) => {
-          expect(user).to.have.property('status', 'ACTIVE');
-        });
-    });
-  });
-
-  describe('#toggleNameEdit', () => {
-    it('should toggle the canEditName field', () => {
-      return UsersService
-        .toggleNameEdit(mockUsers[0].id, true)
-        .then(() => UsersService.findById(mockUsers[0].id))
-        .then((user) => {
-          expect(user).to.have.property('canEditName', true);
-        });
-    });
-  });
-
   describe('#search', () => {
     it('should return all the results without a value', async () => {
       expect(await UsersService.search()).to.have.length(3);
@@ -286,63 +223,63 @@ describe('services.UsersService', () => {
     });
   });
 
-  describe('#editName', () => {
-    it('should let the user edit their username if the proper toggle is set', () => {
-      return UsersService
-        .toggleNameEdit(mockUsers[0].id, true)
-        .then(() => UsersService.editName(mockUsers[0].id, 'Jojo'))
-        .then(() => UsersService.findById(mockUsers[0].id))
-        .then((user) => {
-          expect(user).to.have.property('username', 'Jojo');
-          expect(user).to.have.property('canEditName', false);
-        });
-    });
+  // describe('#editName', () => {
+  //   it('should let the user edit their username if the proper toggle is set', () => {
+  //     return UsersService
+  //       .toggleNameEdit(mockUsers[0].id, true)
+  //       .then(() => UsersService.editName(mockUsers[0].id, 'Jojo'))
+  //       .then(() => UsersService.findById(mockUsers[0].id))
+  //       .then((user) => {
+  //         expect(user).to.have.property('username', 'Jojo');
+  //         expect(user).to.have.property('canEditName', false);
+  //       });
+  //   });
 
-    it('should let the user submit the same username if user is not banned (create username)', () => {
-      return UsersService
-        .toggleNameEdit(mockUsers[0].id, true)
-        .then(() => UsersService.editName(mockUsers[0].id, mockUsers[0].username))
-        .then(() => UsersService.findById(mockUsers[0].id))
-        .then((user) => {
-          expect(user).to.have.property('username', mockUsers[0].username);
-          expect(user).to.have.property('canEditName', false);
-        });
-    });
+  //   it('should let the user submit the same username if user is not banned (create username)', () => {
+  //     return UsersService
+  //       .toggleNameEdit(mockUsers[0].id, true)
+  //       .then(() => UsersService.editName(mockUsers[0].id, mockUsers[0].username))
+  //       .then(() => UsersService.findById(mockUsers[0].id))
+  //       .then((user) => {
+  //         expect(user).to.have.property('username', mockUsers[0].username);
+  //         expect(user).to.have.property('canEditName', false);
+  //       });
+  //   });
 
-    it('should return error when a banned user submits the same username (rejected username)', () => {
-      return UsersService
-        .toggleNameEdit(mockUsers[0].id, true)
-        .then(() => UsersService.setStatus(mockUsers[0].id, 'BANNED'))
-        .then(() => UsersService.editName(mockUsers[0].id, mockUsers[0].username))
-        .then(() => UsersService.findById(mockUsers[0].id))
-        .then(() => {
-          throw new Error('Error expected');
-        })
-        .catch((err) => {
-          expect(err.status).to.equal(400);
-          expect(err.translation_key).to.equal('SAME_USERNAME_PROVIDED');
-        });
-    });
+  //   it('should return error when a banned user submits the same username (rejected username)', () => {
+  //     return UsersService
+  //       .toggleNameEdit(mockUsers[0].id, true)
+  //       .then(() => UsersService.setStatus(mockUsers[0].id, 'BANNED'))
+  //       .then(() => UsersService.editName(mockUsers[0].id, mockUsers[0].username))
+  //       .then(() => UsersService.findById(mockUsers[0].id))
+  //       .then(() => {
+  //         throw new Error('Error expected');
+  //       })
+  //       .catch((err) => {
+  //         expect(err.status).to.equal(400);
+  //         expect(err.translation_key).to.equal('SAME_USERNAME_PROVIDED');
+  //       });
+  //   });
 
-    it('should return an error if canEditName is false', async () => {
-      return expect(UsersService.editName(mockUsers[0].id, 'Jojo')).to.eventually.be.rejected;
-    });
+  //   it('should return an error if canEditName is false', async () => {
+  //     return expect(UsersService.editName(mockUsers[0].id, 'Jojo')).to.eventually.be.rejected;
+  //   });
 
-    it('should return an error if the username is already taken', async () => {
-      await UsersService.toggleNameEdit(mockUsers[0].id, true);
-      return expect(UsersService.editName(mockUsers[0].id, 'Marvel')).to.eventually.be.rejected;
-    });
+  //   it('should return an error if the username is already taken', async () => {
+  //     await UsersService.toggleNameEdit(mockUsers[0].id, true);
+  //     return expect(UsersService.editName(mockUsers[0].id, 'Marvel')).to.eventually.be.rejected;
+  //   });
 
-    it('should not allow non-alphanumeric characters in usernames', () => {
-      return UsersService
-        .isValidUsername('hi🖕')
-        .then(() => {
-          expect(false).to.be.true;
-        })
-        .catch((err) => {
-          expect(err).to.be.ok;
-        });
-    });
-  });
+  //   it('should not allow non-alphanumeric characters in usernames', () => {
+  //     return UsersService
+  //       .isValidUsername('hi🖕')
+  //       .then(() => {
+  //         expect(false).to.be.true;
+  //       })
+  //       .catch((err) => {
+  //         expect(err).to.be.ok;
+  //       });
+  //   });
+  // });
 
 });
diff --git a/yarn.lock b/yarn.lock
index 7996e549f..c3d0775c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -72,7 +72,7 @@ abab@^1.0.0, abab@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
 
-abbrev@1, abbrev@1.0.x:
+abbrev@1:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
@@ -170,14 +170,6 @@ alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
 
-always-error@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/always-error/-/always-error-1.0.0.tgz#95c84042cfa86f38c86ca6c2cc42c0a0103441b2"
-
-am-i-a-dependency@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/am-i-a-dependency/-/am-i-a-dependency-1.0.0.tgz#7c0e2eb126045350852e26e44f6781b3ed387919"
-
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -188,22 +180,10 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
-ansi-escapes@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-
-ansi-escapes@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
-
 ansi-escapes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
 
-ansi-regex@^1.0.0, ansi-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d"
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -306,6 +286,10 @@ array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
 
+array-filter@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -317,6 +301,14 @@ array-includes@^3.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
 
+array-map@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+
+array-reduce@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -335,7 +327,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
-asap@^2.0.0, asap@~2.0.3:
+asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
@@ -389,10 +381,6 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@1.x, async@^1.4.0, async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
 async@2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
@@ -405,6 +393,10 @@ async@2.4.1, async@^2.1.2, async@^2.1.4:
   dependencies:
     lodash "^4.14.0"
 
+async@^1.4.0, async@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
 async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
@@ -1118,14 +1110,6 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@2.9.24:
-  version "2.9.24"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.9.24.tgz#14a2e75f0548323dc35aa440d92007ca154e967c"
-
-bluebird@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
-
 bluebird@^3.3.4, bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -1429,6 +1413,12 @@ chai-as-promised@^6.0.0:
   dependencies:
     check-error "^1.0.2"
 
+chai-datetime@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/chai-datetime/-/chai-datetime-1.5.0.tgz#3742f18b024c75b76a2b7eee291662324467596c"
+  dependencies:
+    chai ">1.9.0"
+
 chai-http@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chai-http/-/chai-http-3.0.0.tgz#5460d8036e1f1a12b0b5b5cbd529e6dc1d31eb4b"
@@ -1446,6 +1436,17 @@ chai-nightwatch@~0.1.x:
     assertion-error "1.0.0"
     deep-eql "0.1.3"
 
+chai@>1.9.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"
+  dependencies:
+    assertion-error "^1.0.1"
+    check-error "^1.0.1"
+    deep-eql "^3.0.0"
+    get-func-name "^2.0.0"
+    pathval "^1.0.0"
+    type-detect "^4.0.0"
+
 chai@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
@@ -1458,14 +1459,6 @@ chain-function@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc"
 
-chalk@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -1498,32 +1491,10 @@ charenc@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
 
-chdir-promise@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/chdir-promise/-/chdir-promise-0.4.1.tgz#1888bb33719699c9fb72138c07556503c4913e85"
-  dependencies:
-    check-more-types "2.24.0"
-    debug "2.6.8"
-    lazy-ass "1.6.0"
-    q "1.5.0"
-    spots "0.5.0"
-
-check-error@^1.0.2:
+check-error@^1.0.1, check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
 
-check-more-types@2.23.0:
-  version "2.23.0"
-  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.23.0.tgz#6226264d30b1095aa1c0a5b874edbdd5d2d0a66f"
-
-check-more-types@2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
-
-check-more-types@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.3.0.tgz#b8397c69dc92a3e645f18932c045b09c74419ec4"
-
 cheerio@^0.20.0:
   version "0.20.0"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.20.0.tgz#5c710f2bab95653272842ba01c6ea61b3545ec35"
@@ -1608,28 +1579,18 @@ cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
 
-cli-cursor@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  dependencies:
-    restore-cursor "^1.0.1"
-
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-table@0.3.1, cli-table@^0.3.1:
+cli-table@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
   dependencies:
     colors "1.0.3"
 
-cli-width@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-1.1.1.tgz#a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"
-
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -1741,14 +1702,10 @@ colors@1.0.3, colors@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
-colors@1.1.2, colors@^1.1.2, colors@~1.1.2:
+colors@^1.1.2, colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
-colors@~0.6.0-1:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
-
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -1761,10 +1718,6 @@ combined-stream@~0.0.4:
   dependencies:
     delayed-stream "0.0.5"
 
-commander@2.11.0, commander@^2.11.0, commander@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-
 commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -1777,9 +1730,9 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
+commander@^2.11.0, commander@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
 common-tags@^1.4.0:
   version "1.4.0"
@@ -1891,19 +1844,6 @@ content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-conventional-commit-message@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-commit-message/-/conventional-commit-message-1.1.0.tgz#ece8c661a168e983692e1d5a14875acb59510f6a"
-  dependencies:
-    check-more-types "2.3.0"
-    cz-conventional-changelog "1.1.5"
-    lazy-ass "1.3.0"
-    word-wrap "1.1.0"
-
-conventional-commit-types@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/conventional-commit-types/-/conventional-commit-types-2.2.0.tgz#5db95739d6c212acbe7b6f656a11b940baa68946"
-
 convert-source-map@^1.4.0, convert-source-map@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
@@ -2171,27 +2111,6 @@ cycle@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
 
-cz-conventional-changelog@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/cz-conventional-changelog/-/cz-conventional-changelog-1.1.5.tgz#0a4d1550c4e2fb6a3aed8f6cd858c21760e119b8"
-  dependencies:
-    word-wrap "^1.0.3"
-
-cz-conventional-changelog@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/cz-conventional-changelog/-/cz-conventional-changelog-2.0.0.tgz#55a979afdfe95e7024879d2a0f5924630170b533"
-  dependencies:
-    conventional-commit-types "^2.0.0"
-    lodash.map "^4.5.1"
-    longest "^1.0.1"
-    pad-right "^0.2.2"
-    right-pad "^1.0.1"
-    word-wrap "^1.0.3"
-
-d3-helpers@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/d3-helpers/-/d3-helpers-0.3.0.tgz#4b31dce4a2121a77336384574d893fbed5fb293d"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -2256,6 +2175,12 @@ deep-eql@0.1.3, deep-eql@^0.1.3:
   dependencies:
     type-detect "0.1.1"
 
+deep-eql@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
+  dependencies:
+    type-detect "^4.0.0"
+
 deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
@@ -2593,7 +2518,7 @@ error-ex@^1.2.0:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.6.1, es-abstract@^1.7.0:
+es-abstract@^1.4.3, es-abstract@^1.6.1, es-abstract@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227"
   dependencies:
@@ -2817,10 +2742,6 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-
 exit@0.1.2, exit@0.1.x:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -2960,13 +2881,6 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
-figures@^1.3.5:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -3043,16 +2957,6 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
-find-parent-dir@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
-
-find-up@2.1.0, find-up@^2.0.0, find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -3060,12 +2964,11 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-findup@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/findup/-/findup-0.1.5.tgz#8ad929a3393bac627957a7e5de4623b06b0e2ceb"
+find-up@^2.0.0, find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   dependencies:
-    colors "~0.6.0-1"
-    commander "~2.1.0"
+    locate-path "^2.0.0"
 
 flat-cache@^1.2.1:
   version "1.3.0"
@@ -3271,6 +3174,10 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -3292,56 +3199,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-ggit@1.23.1:
-  version "1.23.1"
-  resolved "https://registry.yarnpkg.com/ggit/-/ggit-1.23.1.tgz#e513c2f222a6249a46e4d0df354b8604b5baeedb"
-  dependencies:
-    always-error "1.0.0"
-    bluebird "3.5.0"
-    chdir-promise "0.4.1"
-    check-more-types "2.24.0"
-    cli-table "0.3.1"
-    colors "1.1.2"
-    commander "2.11.0"
-    d3-helpers "0.3.0"
-    debug "2.6.8"
-    find-up "2.1.0"
-    glob "7.1.2"
-    lazy-ass "1.6.0"
-    lodash "3.10.1"
-    moment "2.18.1"
-    optimist "0.6.1"
-    pluralize "6.0.0"
-    q "2.0.3"
-    quote "0.4.0"
-    ramda "0.24.1"
-    semver "5.4.1"
-
-ggit@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ggit/-/ggit-2.0.1.tgz#6cdfbb2bac9b63108a9609923eeca44205a9e8f4"
-  dependencies:
-    always-error "1.0.0"
-    bluebird "3.5.0"
-    chdir-promise "0.4.1"
-    check-more-types "2.24.0"
-    cli-table "0.3.1"
-    colors "1.1.2"
-    commander "2.11.0"
-    d3-helpers "0.3.0"
-    debug "2.6.8"
-    find-up "2.1.0"
-    glob "7.1.2"
-    lazy-ass "1.6.0"
-    lodash "4.17.4"
-    moment "2.18.1"
-    optimist "0.6.1"
-    pluralize "6.0.0"
-    q "2.0.3"
-    quote "0.4.0"
-    ramda "0.24.1"
-    semver "5.4.1"
-
 git-up@^2.0.0:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/git-up/-/git-up-2.0.9.tgz#219bfd27c82daeead8495beb386dc18eae63636d"
@@ -3401,17 +3258,6 @@ glob@7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^5.0.3:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -3422,6 +3268,17 @@ glob@^5.0.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-dirs@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.0.tgz#10d34039e0df04272e262cf24224f7209434df4f"
@@ -3806,10 +3663,6 @@ hpkp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/hpkp/-/hpkp-2.0.0.tgz#10e142264e76215a5d30c44ec43de64dee6d1672"
 
-hr@0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/hr/-/hr-0.1.3.tgz#d9aa30f5929dabfd0b65ba395938a3e184dbcafe"
-
 hsts@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/hsts/-/hsts-2.1.0.tgz#cbd6c918a2385fee1dd5680bfb2b3a194c0121cc"
@@ -3993,63 +3846,6 @@ ini@^1.3.0, ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer-confirm@0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/inquirer-confirm/-/inquirer-confirm-0.2.2.tgz#6f406d037bf9d9e455ef0f953929f357fe9a8848"
-  dependencies:
-    bluebird "2.9.24"
-    inquirer "0.8.2"
-
-inquirer@0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-inquirer@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.8.2.tgz#41586548e1c5d9b3f81df7325034baacab6f58ab"
-  dependencies:
-    ansi-regex "^1.1.1"
-    chalk "^1.0.0"
-    cli-width "^1.0.1"
-    figures "^1.3.5"
-    lodash "^3.3.1"
-    readline2 "^0.1.1"
-    rx "^2.4.3"
-    through "^2.3.6"
-
-inquirer@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.2.1.tgz#06ceb0f540f45ca548c17d6840959878265fa175"
-  dependencies:
-    ansi-escapes "^2.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 inquirer@^3.0.6, inquirer@^3.2.2:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
@@ -4412,7 +4208,7 @@ isstream@0.1.x, isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^1.1.0-alpha, istanbul-api@^1.1.1:
+istanbul-api@^1.1.1:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.14.tgz#25bc5701f7c680c0ffff913de46e3619a3a6e680"
   dependencies:
@@ -4475,19 +4271,6 @@ istanbul-reports@^1.1.2:
   dependencies:
     handlebars "^4.0.3"
 
-istanbul@^1.1.0-alpha.1:
-  version "1.1.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-1.1.0-alpha.1.tgz#781795656018a2174c5f60f367ee5d361cb57b77"
-  dependencies:
-    abbrev "1.0.x"
-    async "1.x"
-    istanbul-api "^1.1.0-alpha"
-    js-yaml "3.x"
-    mkdirp "0.5.x"
-    nopt "3.x"
-    which "^1.1.1"
-    wordwrap "^1.0.0"
-
 items@2.x.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/items/-/items-2.1.1.tgz#8bd16d9c83b19529de5aea321acaada78364a198"
@@ -4759,7 +4542,7 @@ js-yaml@0.3.x:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-0.3.7.tgz#d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"
 
-js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.5.2, js-yaml@^3.7.0, js-yaml@^3.9.1:
+js-yaml@^3.4.3, js-yaml@^3.5.2, js-yaml@^3.7.0, js-yaml@^3.9.1:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
   dependencies:
@@ -5002,31 +4785,12 @@ kue@0.11.6:
   optionalDependencies:
     reds "^0.2.5"
 
-largest-semantic-change@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/largest-semantic-change/-/largest-semantic-change-1.0.0.tgz#25dc538bdaaa8bbdc30276b1ebf902d47a34bf0e"
-  dependencies:
-    check-more-types "2.23.0"
-    lazy-ass "1.5.0"
-
 latest-version@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
   dependencies:
     package-json "^4.0.0"
 
-lazy-ass@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.3.0.tgz#7d0d14eef3ec9702c6f30c60ea81f1a8d3f900fb"
-
-lazy-ass@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.5.0.tgz#ca15be243c7c475b8565cdbfa0f9c2f374f2a01d"
-
-lazy-ass@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
-
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@@ -5333,10 +5097,6 @@ lodash.keysin@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-4.2.0.tgz#8cc3fb35c2d94acc443a1863e02fa40799ea6f28"
 
-lodash.map@^4.5.1:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
-
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -5401,15 +5161,11 @@ lodash.values@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
 
-lodash@3.10.1, lodash@^3.3.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-
 lodash@3.7.x:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
 
-lodash@4.17.4, lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -5541,6 +5297,12 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memory-streams@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/memory-streams/-/memory-streams-0.1.2.tgz#273ff777ab60fec599b116355255282cca2c50c2"
+  dependencies:
+    readable-stream "~1.0.2"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -5697,10 +5459,6 @@ mocha@^3.1.2:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
-moment@2.18.1:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
-
 moment@2.x.x, moment@^2.10.3, moment@^2.18.1:
   version "2.19.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"
@@ -5784,14 +5542,6 @@ murmurhash-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51"
 
-mute-stream@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.4.tgz#a9219960a6d5d5d046597aee51252c6655f7177e"
-
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -6042,12 +5792,6 @@ nomnom@~1.6.2:
     colors "0.5.x"
     underscore "~1.4.4"
 
-nopt@3.x:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -6089,6 +5833,20 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+npm-run-all@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.1.tgz#3095cf3f3cacf57fcb662b210ab10c609af6ddbb"
+  dependencies:
+    ansi-styles "^3.2.0"
+    chalk "^2.1.0"
+    cross-spawn "^5.1.0"
+    memory-streams "^0.1.2"
+    minimatch "^3.0.4"
+    ps-tree "^1.1.0"
+    read-pkg "^2.0.0"
+    shell-quote "^1.6.1"
+    string.prototype.padend "^3.0.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6187,10 +5945,6 @@ once@^1.3.0, once@^1.3.3, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -6307,12 +6061,6 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pad-right@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/pad-right/-/pad-right-0.2.2.tgz#6fbc924045d244f2a2a244503060d3bfc6009774"
-  dependencies:
-    repeat-string "^1.5.2"
-
 pako@~0.2.0:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
@@ -6441,6 +6189,10 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
+pathval@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
+
 pause-stream@0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
@@ -6511,18 +6263,10 @@ platform@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.4.tgz#6f0fb17edaaa48f21442b3a975c063130f1c3ebd"
 
-pluralize@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-6.0.0.tgz#d9b51afad97d3d51075cc1ddba9b132cacccb7ba"
-
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
 
-pop-iterate@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/pop-iterate/-/pop-iterate-1.0.1.tgz#ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"
-
 popsicle@^6.2.0:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/popsicle/-/popsicle-6.2.2.tgz#e273c8bd48181f73a59b199e2a5e25b692b3e237"
@@ -6946,25 +6690,6 @@ postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^4.4.0"
 
-pre-git@^3.15.3:
-  version "3.15.3"
-  resolved "https://registry.yarnpkg.com/pre-git/-/pre-git-3.15.3.tgz#834a598a0608b821ba1e9e217f58d510bc7b0ca9"
-  dependencies:
-    bluebird "3.5.0"
-    chalk "2.0.1"
-    check-more-types "2.24.0"
-    conventional-commit-message "1.1.0"
-    cz-conventional-changelog "2.0.0"
-    debug "2.6.8"
-    ggit "2.0.1"
-    inquirer "3.2.1"
-    lazy-ass "1.6.0"
-    require-relative "0.8.7"
-    shelljs "0.7.8"
-    simple-commit-message "3.3.1"
-    validate-commit-msg "2.14.0"
-    word-wrap "1.2.3"
-
 precss@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/precss/-/precss-1.4.0.tgz#8d7c3ae70f10a00a3955287f85a66e0f8b31cda3"
@@ -7206,18 +6931,10 @@ q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-q@1.5.0, q@^1.1.2:
+q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
-q@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/q/-/q-2.0.3.tgz#75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"
-  dependencies:
-    asap "^2.0.0"
-    pop-iterate "^1.0.1"
-    weak-map "^1.0.5"
-
 qs@6.5.1, qs@^6.1.0, qs@^6.2.0, qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
@@ -7253,10 +6970,6 @@ querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
-quote@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01"
-
 raf@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
@@ -7267,7 +6980,7 @@ railroad-diagrams@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
 
-ramda@0.24.1, ramda@^0.24.1:
+ramda@^0.24.1:
   version "0.24.1"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857"
 
@@ -7506,6 +7219,15 @@ readable-stream@2, readable-stream@2.2.7, readable-stream@^2.0.0, readable-strea
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
+readable-stream@~1.0.2:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -7515,21 +7237,6 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
-readline2@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-0.1.1.tgz#99443ba6e83b830ef3051bfd7dc241a82728d568"
-  dependencies:
-    mute-stream "0.0.4"
-    strip-ansi "^2.0.1"
-
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -7781,10 +7488,6 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
-require-relative@0.8.7:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
-
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -7817,13 +7520,6 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.4.0:
   dependencies:
     path-parse "^1.0.5"
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -7845,10 +7541,6 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-right-pad@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
-
 rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
@@ -7875,12 +7567,6 @@ rst-selector-parser@^2.2.2:
     lodash.flattendeep "^4.4.0"
     nearley "^2.7.10"
 
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  dependencies:
-    once "^1.3.0"
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -7897,14 +7583,6 @@ rx-lite@*, rx-lite@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
 
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-
-rx@^2.4.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-2.5.3.tgz#21adc7d80f02002af50dae97fd9dbf248755f566"
-
 safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -7977,11 +7655,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-semver-regex@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
-
-"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
@@ -8053,11 +7727,20 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
+shell-quote@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
+  dependencies:
+    array-filter "~0.0.0"
+    array-map "~0.0.0"
+    array-reduce "~0.0.0"
+    jsonify "~0.0.0"
+
 shelljs@0.3.x:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
 
-shelljs@0.7.8, shelljs@^0.7.0:
+shelljs@^0.7.0:
   version "0.7.8"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
   dependencies:
@@ -8073,22 +7756,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-simple-commit-message@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/simple-commit-message/-/simple-commit-message-3.3.1.tgz#b69026a9692e0f470233a4c5c1df3432cdb50560"
-  dependencies:
-    am-i-a-dependency "1.0.0"
-    check-more-types "2.24.0"
-    debug "2.6.8"
-    ggit "1.23.1"
-    hr "0.1.3"
-    inquirer "0.12.0"
-    inquirer-confirm "0.2.2"
-    largest-semantic-change "1.0.0"
-    lazy-ass "1.6.0"
-    semver "5.4.1"
-    word-wrap "1.2.3"
-
 simplemde@^1.11.2:
   version "1.11.2"
   resolved "https://registry.yarnpkg.com/simplemde/-/simplemde-1.11.2.tgz#a23a35d978d2c40ef07dec008c92f070d8e080e3"
@@ -8252,10 +7919,6 @@ split@0.3:
   dependencies:
     through "2"
 
-spots@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/spots/-/spots-0.5.0.tgz#b7aa0f1ac389a5a6d57c21e98da1d53839405fe1"
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -8335,6 +7998,14 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string.prototype.padend@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.4.3"
+    function-bind "^1.0.2"
+
 string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -8349,12 +8020,6 @@ stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
-strip-ansi@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-2.0.1.tgz#df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"
-  dependencies:
-    ansi-regex "^1.0.0"
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -8919,15 +8584,6 @@ v8flags@^2.1.1:
   dependencies:
     user-home "^1.1.1"
 
-validate-commit-msg@2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/validate-commit-msg/-/validate-commit-msg-2.14.0.tgz#e5383691012cbb270dcc0bc2a4effebe14890eac"
-  dependencies:
-    conventional-commit-types "^2.0.0"
-    find-parent-dir "^0.3.0"
-    findup "0.1.5"
-    semver-regex "1.0.0"
-
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
@@ -8988,10 +8644,6 @@ watchpack@^1.3.1:
     chokidar "^1.7.0"
     graceful-fs "^4.1.2"
 
-weak-map@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz#79691584d98607f5070bd3b70a40e6bb22e401eb"
-
 webidl-conversions@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
@@ -9079,7 +8731,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.1.1, which@^1.2.12, which@^1.2.9:
+which@^1.2.12, which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -9127,26 +8779,18 @@ with@^5.0.0:
     acorn "^3.1.0"
     acorn-globals "^3.0.0"
 
-word-wrap@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.1.0.tgz#356153d61d10610d600785c5d701288e0ae764a6"
-
-word-wrap@1.2.3, word-wrap@^1.0.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-wordwrap@^1.0.0, wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
 worker-farm@^1.3.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.0.tgz#adfdf0cd40581465ed0a1f648f9735722afd5c8d"