Merge branch 'master' into develop

Conflicts:
	README.md
	discord.go

.travis.yml

@@ -10,5 +10,5 @@ install:
 script:
     - diff <(gofmt -d .) <(echo -n)
     - go vet -x ./...
-    - golint -set_exit_status ./...
+    - golint ./...
     - go test -v -race ./...

discord.go

@@ -20,7 +20,7 @@ import (
 	"time"
 )
 
-// VERSION of Discordgo, follows Symantic Versioning. (http://semver.org/)
+// VERSION of DiscordGo, follows Semantic Versioning. (http://semver.org/)
 const VERSION = "0.16.0-dev"
 
 // ErrMFA will be risen by New when the user has 2FA.