Merge branch 'master' into indev-prism

CONTRIBUTING.md

@@ -6,7 +6,7 @@ is a great boon to your coding process.
 ## Setup
 To get ready to work on the codebase, please do the following:
 
-1. Fork & clone the repository, and make sure you're on the **indev** branch
+1. Fork & clone the repository, and make sure you're on the **master** branch
 2. Run `npm install`
 3. If you're working on voice, also run `npm install node-opus` or `npm install opusscript`
 4. Code your heart out!

deploy/deploy.sh

@@ -19,10 +19,8 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
 fi
 
 # Ignore travis checking other branches irrelevant to users
-# Apparently Travis considers tag builds as separate branches so we need to
-# check for that separately
-if [ "$TRAVIS_BRANCH" != "master" -a "$TRAVIS_BRANCH" != "indev" -a "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ]; then
-  echo "deploy.sh: Ignoring push to another branch than master/indev"
+if [ "$TRAVIS_BRANCH" == "gh-pages" -o "$TRAVIS_BRANCH" == "gh-pages-dev" -o "$TRAVIS_BRANCH" == "docs" -o "$TRAVIS_BRANCH" == "webpack" -o "$TRAVIS_BRANCH" == "v8" ]; then
+  echo "deploy.sh: Ignoring push to blacklisted branch"
   build
   exit 0
 fi

src/structures/Guild.js

@@ -542,12 +542,12 @@ class Guild {
    * @example
    * // see how many members will be pruned
    * guild.pruneMembers(12, true)
-   *   .then(pruned => console.log(`This will prune ${pruned} people!`);
+   *   .then(pruned => console.log(`This will prune ${pruned} people!`))
    *   .catch(console.error);
    * @example
    * // actually prune the members
    * guild.pruneMembers(12)
-   *   .then(pruned => console.log(`I just pruned ${pruned} people!`);
+   *   .then(pruned => console.log(`I just pruned ${pruned} people!`))
    *   .catch(console.error);
    */
   pruneMembers(days, dry = false) {