diff --git a/Cargo.lock b/Cargo.lock
index 18830e26e..d5d951da0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -492,8 +492,8 @@ dependencies = [
  "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "md5 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha3 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -749,8 +749,8 @@ dependencies = [
  "getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "uucore 0.0.1",
 ]
 
@@ -920,8 +920,8 @@ dependencies = [
  "getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "uucore 0.0.1",
 ]
 
@@ -984,19 +984,19 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1153,7 +1153,6 @@ name = "stdbuf"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "libstdbuf 0.0.1",
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "uucore 0.0.1",
@@ -1528,115 +1527,7 @@ dependencies = [
  "rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "readlink 0.0.1",
  "realpath 0.0.1",
- "regex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "relpath 0.0.1",
- "rm 0.0.1",
- "rmdir 0.0.1",
- "seq 0.0.1",
- "shred 0.0.1",
- "shuf 0.0.1",
- "sleep 0.0.1",
- "sort 0.0.1",
- "split 0.0.1",
- "stat 0.0.1",
- "stdbuf 0.0.1",
- "sum 0.0.1",
- "sync 0.0.1",
- "tac 0.0.1",
- "tail 0.0.1",
- "tee 0.0.1",
- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "test 0.0.1",
- "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
- "timeout 0.0.1",
- "touch 0.0.1",
- "tr 0.0.1",
- "true 0.0.1",
- "truncate 0.0.1",
- "tsort 0.0.1",
- "tty 0.0.1",
- "uname 0.0.1",
- "unexpand 0.0.1",
- "unindent 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uniq 0.0.1",
- "unix_socket 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unlink 0.0.1",
- "uptime 0.0.1",
- "users 0.0.1",
- "uucore 0.0.1",
- "wc 0.0.1",
- "who 0.0.1",
- "whoami 0.0.1",
- "yes 0.0.1",
-]
-
-[[package]]
-name = "uutils"
-version = "0.0.1"
-dependencies = [
- "arch 0.0.1",
- "base32 0.0.1",
- "base64 0.0.1",
- "basename 0.0.1",
- "cat 0.0.1",
- "chgrp 0.0.1",
- "chmod 0.0.1",
- "chown 0.0.1",
- "chroot 0.0.1",
- "cksum 0.0.1",
- "comm 0.0.1",
- "cp 0.0.1",
- "cut 0.0.1",
- "date 0.0.1",
- "dircolors 0.0.1",
- "dirname 0.0.1",
- "du 0.0.1",
- "echo 0.0.1",
- "env 0.0.1",
- "expand 0.0.1",
- "expr 0.0.1",
- "factor 0.0.1",
- "false 0.0.1",
- "filetime 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "fmt 0.0.1",
- "fold 0.0.1",
- "groups 0.0.1",
- "hashsum 0.0.1",
- "head 0.0.1",
- "hostid 0.0.1",
- "hostname 0.0.1",
- "id 0.0.1",
- "install 0.0.1",
- "kill 0.0.1",
- "lazy_static 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "link 0.0.1",
- "ln 0.0.1",
- "logname 0.0.1",
- "ls 0.0.1",
- "mkdir 0.0.1",
- "mkfifo 0.0.1",
- "mknod 0.0.1",
- "mktemp 0.0.1",
- "more 0.0.1",
- "mv 0.0.1",
- "nice 0.0.1",
- "nl 0.0.1",
- "nohup 0.0.1",
- "nproc 0.0.1",
- "numfmt 0.0.1",
- "od 0.0.1",
- "paste 0.0.1",
- "pathchk 0.0.1",
- "pinky 0.0.1",
- "printenv 0.0.1",
- "printf 0.0.1",
- "ptx 0.0.1",
- "pwd 0.0.1",
- "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "readlink 0.0.1",
- "realpath 0.0.1",
- "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "relpath 0.0.1",
  "rm 0.0.1",
  "rmdir 0.0.1",
@@ -1845,8 +1736,8 @@ dependencies = [
 "checksum rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "9e7944d95d25ace8f377da3ac7068ce517e4c646754c43a1b1849177bbf72e59"
 "checksum redox_syscall 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "07b8f011e3254d5a9b318fde596d409a0001c9ae4c6e7907520c2eaa4d988c99"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum regex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ac6ab4e9218ade5b423358bbd2567d1617418403c7a512603630181813316322"
-"checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
+"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa"
+"checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
 "checksum remove_dir_all 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0882bc41b0ba6131c7f0ce97233b62d8099e3f3abc60d4938185d3e35439c0cc"
 "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
 "checksum semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85"