diff --git a/docs/glide.yaml.md b/docs/glide.yaml.md
index 7592321..7b700eb 100644
--- a/docs/glide.yaml.md
+++ b/docs/glide.yaml.md
@@ -23,6 +23,7 @@
       repo:    git@github.com:Masterminds/vcs
       vcs:     git
     - package: github.com/codegangsta/cli
+      version: f89effe81c1ece9c5b0fda359ebd9cf65f169a51
     - package: github.com/Masterminds/semver
       version: ^1.0.0
     testImport:
diff --git a/glide.go b/glide.go
index 5f9c14f..ebe0aa0 100644
--- a/glide.go
+++ b/glide.go
@@ -250,7 +250,7 @@
 					msg.Warn("The --update-vendored flag is deprecated. This now works by default.")
 				}
 				if c.String("file") != "" {
-					msg.Warn("The --flag flag is deprecated.")
+					msg.Warn("The --file flag is deprecated.")
 				}
 				if c.Bool("cache") {
 					msg.Warn("The --cache flag is deprecated. This now works by default.")
@@ -423,8 +423,8 @@
 			Name:      "install",
 			ShortName: "i",
 			Usage:     "Install a project's dependencies",
-			Description: `This uses the native VCS of each packages to install
-   the appropriate version. There are two ways a projects dependencies can
+			Description: `This uses the native VCS of each package to install
+   the appropriate version. There are two ways a project's dependencies can
    be installed. When there is a glide.yaml file defining the dependencies but
    no lock file (glide.lock) the dependencies are installed using the "update"
    command and a glide.lock file is generated pinning all dependencies. If a
diff --git a/repo/vcs.go b/repo/vcs.go
index 57ae33c..780e60a 100644
--- a/repo/vcs.go
+++ b/repo/vcs.go
@@ -26,12 +26,12 @@
 	// If the dependency has already been pinned we can skip it. This is a
 	// faster path so we don't need to resolve it again.
 	if dep.Pin != "" {
-		msg.Debug("Dependency %s has already been pinned. Fetching updates skipped.", dep.Name)
+		msg.Debug("Dependency %s has already been pinned. Fetching updates skipped", dep.Name)
 		return nil
 	}
 
 	if updated.Check(dep.Name) {
-		msg.Debug("%s was already updated, skipping.", dep.Name)
+		msg.Debug("%s was already updated, skipping", dep.Name)
 		return nil
 	}
 	updated.Add(dep.Name)
@@ -50,14 +50,14 @@
 
 	// If destination doesn't exist we need to perform an initial checkout.
 	if _, err := os.Stat(dest); os.IsNotExist(err) {
-		msg.Info("--> Fetching %s.", dep.Name)
+		msg.Info("--> Fetching %s", dep.Name)
 		if err = VcsGet(dep); err != nil {
 			msg.Warn("Unable to checkout %s\n", dep.Name)
 			return err
 		}
 	} else {
 		// At this point we have a directory for the package.
-		msg.Info("--> Fetching updates for %s.", dep.Name)
+		msg.Info("--> Fetching updates for %s", dep.Name)
 
 		// When the directory is not empty and has no VCS directory it's
 		// a vendored files situation.
@@ -67,7 +67,7 @@
 		}
 		_, err = v.DetectVcsFromFS(dest)
 		if empty == true && err == v.ErrCannotDetectVCS {
-			msg.Warn("Cached version of %s is an empty directory. Fetching a new copy of the dependency.", dep.Name)
+			msg.Warn("Cached version of %s is an empty directory. Fetching a new copy of the dependency", dep.Name)
 			msg.Debug("Removing empty directory %s", dest)
 			err := os.RemoveAll(dest)
 			if err != nil {
@@ -130,7 +130,7 @@
 				// branch it's a tag or commit id so we can skip
 				// performing an update.
 				if version == ver && !ib {
-					msg.Debug("%s is already set to version %s. Skipping update.", dep.Name, dep.Reference)
+					msg.Debug("%s is already set to version %s. Skipping update", dep.Name, dep.Reference)
 					return nil
 				}
 			}
@@ -151,7 +151,7 @@
 	// If the dependency has already been pinned we can skip it. This is a
 	// faster path so we don't need to resolve it again.
 	if dep.Pin != "" {
-		msg.Debug("Dependency %s has already been pinned. Setting version skipped.", dep.Name)
+		msg.Debug("Dependency %s has already been pinned. Setting version skipped", dep.Name)
 		return nil
 	}
 
@@ -232,7 +232,7 @@
 			}
 		}
 		if found {
-			msg.Info("--> Detected semantic version. Setting version for %s to %s.", dep.Name, ver)
+			msg.Info("--> Detected semantic version. Setting version for %s to %s", dep.Name, ver)
 		} else {
 			msg.Warn("--> Unable to find semantic version for constraint %s %s", dep.Name, ver)
 		}
