diff --git a/Cargo.lock b/Cargo.lock
index 78640e872..0ca17dc23 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,3 +1,5 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
 [[package]]
 name = "aho-corasick"
 version = "0.6.10"
@@ -31,11 +33,6 @@ dependencies = [
  "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "arrayref"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "arrayvec"
 version = "0.4.10"
@@ -46,7 +43,7 @@ dependencies = [
 
 [[package]]
 name = "asciii"
-version = "3.5.0"
+version = "3.5.1"
 dependencies = [
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bill 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -76,7 +73,7 @@ dependencies = [
  "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "prettytable-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocket 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocket_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocket_contrib 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -100,7 +97,7 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -118,7 +115,7 @@ dependencies = [
  "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -185,16 +182,26 @@ dependencies = [
 
 [[package]]
 name = "block-buffer"
-version = "0.3.3"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "byte-tools"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -353,9 +360,9 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -365,10 +372,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "digest"
-version = "0.7.6"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -414,7 +421,7 @@ dependencies = [
  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -432,9 +439,9 @@ name = "failure_derive"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -445,7 +452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "filetime"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -492,7 +499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "generic-array"
-version = "0.9.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -522,10 +529,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -598,7 +605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro-hack 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -838,7 +845,7 @@ version = "4.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -871,6 +878,16 @@ dependencies = [
  "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "numtoa"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "opaque-debug"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "open"
 version = "1.2.2"
@@ -917,9 +934,9 @@ name = "pear_codegen"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "yansi 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -931,7 +948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "pest"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -942,7 +959,7 @@ name = "pest_derive"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -951,21 +968,21 @@ name = "pest_generator"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1009,7 +1026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "proc-macro2"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1025,7 +1042,7 @@ name = "quote"
 version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1142,7 +1159,7 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1265,7 +1282,7 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1352,9 +1369,9 @@ name = "serde_derive"
 version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1388,13 +1405,13 @@ dependencies = [
 
 [[package]]
 name = "sha-1"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1430,17 +1447,17 @@ name = "syn"
 version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "syn"
-version = "0.15.30"
+version = "0.15.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1450,9 +1467,9 @@ name = "synstructure"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1495,10 +1512,11 @@ dependencies = [
 
 [[package]]
 name = "termion"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1771,7 +1789,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
-"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
@@ -1784,8 +1801,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
-"checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
-"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
+"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09"
+"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 "checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
 "checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
 "checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
@@ -1806,7 +1824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum devise_codegen 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "066ceb7928ca93a9bedc6d0e612a8a0424048b0ab1f75971b203d01420c055d7"
 "checksum devise_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf41c59b22b5e3ec0ea55c7847e5f358d340f3a8d6d53a5cf4f1564967f96487"
 "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-"checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
+"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
 "checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"
@@ -1817,13 +1835,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
 "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-"checksum filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a2df5c1a8c4be27e7707789dc42ae65976e60b394afd293d1419ab915833e646"
+"checksum filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2f8c63033fcba1f51ef744505b3cad42510432b904c062afa67ad7ece008429d"
 "checksum fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c4bbbf71584aeed076100b5665ac14e3d85eeb31fdbb45fbd41ef9a682b5ec05"
 "checksum fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a772d36c338d07a032d5375a36f15f9a7043bf0cb8ce7cee658e037c6032874"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
+"checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592"
 "checksum git2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7339329bfa14a00223244311560d11f8f489b453fb90092af97f267a6090ab0"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum handlebars 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d82e5750d8027a97b9640e3fefa66bbaf852a35228e1c90790efd13c4b09c166"
@@ -1867,6 +1885,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
 "checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
+"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
+"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409"
 "checksum open 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eedfa0ca7b54d84d948bfd058b8f82e767d11f362dd78c36866fd1f69c175867"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 "checksum openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)" = "33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"
@@ -1874,16 +1894,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum pear 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c26d2b92e47063ffce70d3e3b1bd097af121a9e0db07ca38a6cc1cf0cc85ff25"
 "checksum pear_codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "336db4a192cc7f54efeb0c4e11a9245394824cc3bcbd37ba3ff51240c35d7a6e"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-"checksum pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54f0c72a98d8ab3c99560bfd16df8059cc10e1f9a8e83e6e3b97718dd766e9c3"
+"checksum pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c"
 "checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
 "checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646"
-"checksum pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5a3492a4ed208ffc247adcdcc7ba2a95be3104f58877d0d02f0df39bf3efb5e"
+"checksum pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d"
 "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
 "checksum pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3a029430f0d744bc3d15dd474d591bed2402b645d024583082b9f63bb936dac6"
 "checksum prettytable-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5511ca4c805aa35f0abff6be7923231d664408b60c09f44ef715f2bce106cd9e"
 "checksum proc-macro-hack 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c725b36c99df7af7bf9324e9c999b9e37d92c8f8caf106d82e1d7953218d2d8"
 "checksum proc-macro-hack-impl 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2b753ad9ed99dd8efeaa7d2fb8453c8f6bc3e54b97966d35f1bc77ca6865254a"
-"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
+"checksum proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)" = "ba92c84f814b3f9a44c5cfca7d2ad77fa10710867d2bbb1b3d175ab5f47daa12"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
 "checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
@@ -1898,7 +1918,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828"
 "checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
-"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0"
+"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58"
 "checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
 "checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
@@ -1908,7 +1928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rocket_contrib 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f73e161dad5730435f51c815a5c6831d2e57b6b4299b1bf609d31b09aa9a2fa7"
 "checksum rocket_cors 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d8adde8b1ed231f4a0288085605d869baa02503310a4f80c07ed53fde24dce1b"
 "checksum rocket_http 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba9d4f2ce5bba6e1b6d3100493bbad63879e99bbf6b4365d61e6f781daab324d"
-"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
+"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum rustyline 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00b06ac9c8e8e3e83b33d175d39a9f7b6c2c930c82990593719c8e48788ae2d9"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
@@ -1924,20 +1944,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
 "checksum serde_test 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce17ed207fa61e7f4701a778a6c111da84a441ca9a8f50b92808f4223dd240b"
 "checksum serde_yaml 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0887a8e097a69559b56aa2526bf7aff7c3048cf627dff781f0b56a6001534593"
-"checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded"
+"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373"
 "checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
 "checksum state 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7345c971d1ef21ffdbd103a75990a15eb03604fc8b8852ca8cb418ee1a099028"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 "checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
-"checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
+"checksum syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)" = "846620ec526c1599c070eff393bfeeeb88a93afa2513fc3b49f1fea84cf7b0ed"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
 "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
+"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
diff --git a/Cargo.toml b/Cargo.toml
index aae0677b3..46367cd52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "asciii"
-version = "3.5.0"
+version = "3.5.1"
 authors = ["Hendrik Sollich <hendrik@hoodie.de>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
diff --git a/lang/default.pot b/lang/default.pot
index b2429cb7b..5a19fa878 100644
--- a/lang/default.pot
+++ b/lang/default.pot
@@ -556,31 +556,31 @@ msgstr ""
 msgid "no remote name"
 msgstr ""
 
-#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:395
+#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:396
 msgid "You have to provide either a search term or path"
 msgstr ""
 
-#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:511
+#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:512
 msgid "do you want to set your name?"
 msgstr ""
 
-#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:513
+#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:514
 msgid "Is your name {:?}"
 msgstr ""
 
-#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:519
+#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:520
 msgid "What is your name?"
 msgstr ""
 
-#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:638 /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:648
+#: /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:639 /home/hendrik/code/ascii/asciii/src/bin/cli/subcommands/mod.rs:649
 msgid "{} does not exist"
 msgstr ""
 
-#: /home/hendrik/code/ascii/asciii/src/document_export/mod.rs:184
+#: /home/hendrik/code/ascii/asciii/src/document_export/mod.rs:185
 msgid "WARNING: Can't make sense of {}"
 msgstr ""
 
-#: /home/hendrik/code/ascii/asciii/src/document_export/mod.rs:222
+#: /home/hendrik/code/ascii/asciii/src/document_export/mod.rs:223
 msgid "Project file is younger than pdf, continue anyway?"
 msgstr ""
 
diff --git a/src/actions/mod.rs b/src/actions/mod.rs
index f87d10080..edbb21421 100644
--- a/src/actions/mod.rs
+++ b/src/actions/mod.rs
@@ -100,7 +100,7 @@ fn unpayed_employees(projects: &[Project]) -> HashMap<String, Currency> {
     let employees = projects.iter()
                             .filter(|p| !p.canceled() && p.age().unwrap_or(0) > 0)
                             .filter_map(|p| p.hours().employees())
-                            .flat_map(|e| e.into_iter());
+                            .flat_map(IntoIterator::into_iter);
 
     for employee in employees {
         let bucket = buckets.entry(employee.name.clone()).or_insert_with(Currency::new);
@@ -151,8 +151,8 @@ pub fn spec() -> Result<(), Error> {
         project.age().map(|a|format!("{} days", a)).unwrap();
         project.modified_date().map(|d|d.year().to_string()).unwrap();
         project.sum_sold().map(|c|util::currency_to_string(&c)).unwrap();
-        project.responsible().map(|s|s.to_owned()).unwrap();
-        project.name().map(|s|s.to_owned()).unwrap();
+        project.responsible().map(ToOwned::to_owned).unwrap();
+        project.name().map(ToOwned::to_owned).unwrap();
     }
 
     Ok(())
diff --git a/src/bin/cli/subcommands/list.rs b/src/bin/cli/subcommands/list.rs
index bcbd440ac..85d9a0dc4 100644
--- a/src/bin/cli/subcommands/list.rs
+++ b/src/bin/cli/subcommands/list.rs
@@ -27,7 +27,7 @@ pub fn list(matches: &ArgMatches<'_>) -> Result<(), Error> {
                                     matches.is_present("csv"));
 
         let extra_details = matches.values_of("details")
-                                   .map(|v| v.collect::<Vec<&str>>());
+                                   .map(Iterator::collect);
         let config_details = CONFIG.get_strs("list/extra_details");
 
         let mut list_config = ListConfig {
@@ -36,7 +36,7 @@ pub fn list(matches: &ArgMatches<'_>) -> Result<(), Error> {
             mode: list_mode,
             details: extra_details.or(config_details),
             filter_by: matches.values_of("filter")
-                              .map(|v| v.collect::<Vec<&str>>()),
+                              .map(Iterator::collect),
             show_errors: matches.is_present("errors"),
 
             ..Default::default()
diff --git a/src/bin/cli/subcommands/mod.rs b/src/bin/cli/subcommands/mod.rs
index 9a0d0eac3..795a2e44f 100644
--- a/src/bin/cli/subcommands/mod.rs
+++ b/src/bin/cli/subcommands/mod.rs
@@ -10,6 +10,7 @@ use clap::ArgMatches;
 use failure::{bail, format_err, Error};
 use chrono::prelude::*;
 use log::{debug, trace, error, warn};
+use yaml_rust::Yaml;
 
 use asciii::{self, CONFIG, config, util, actions};
 use asciii::project::Exportable;
@@ -43,7 +44,7 @@ pub use self::show::*;
 // #[deprecated(note="move to asciii::actions")]
 pub fn new(matches: &ArgMatches<'_>) -> Result<(), Error> {
     let project_name = matches.value_of("name").expect("You did not pass a \"Name\"!");
-    let editor = CONFIG.get("user/editor").and_then(|e| e.as_str());
+    let editor = CONFIG.get("user/editor").and_then(Yaml::as_str);
 
     let template_name = matches.value_of("template")
         .or_else(||CONFIG.get("template").unwrap().as_str())
@@ -118,7 +119,7 @@ fn matches_to_dir(matches: &ArgMatches<'_>) -> StorageDir {
 fn matches_to_search<'a>(matches: &'a ArgMatches<'_>) -> (Vec<&'a str>, StorageDir) {
     let search_terms = matches
         .values_of("search_term")
-        .map(|v| v.collect::<Vec<&str>>())
+        .map(Iterator::collect)
         .unwrap_or_else(Vec::new);
 
     debug!("matches_to_search: --archive={:?}", matches.value_of("archive"));
@@ -133,7 +134,7 @@ fn matches_to_search<'a>(matches: &'a ArgMatches<'_>) -> (Vec<&'a str>, StorageD
 /// This is more general than `with_projects`, as this includes templates too.
 pub fn matches_to_paths(matches: &ArgMatches<'_>, storage: &Storage<Project>) -> Result<Vec<PathBuf>, Error> {
     let search_terms = matches.values_of("search_term")
-                              .map(|v| v.collect::<Vec<&str>>())
+                              .map(Iterator::collect)
                               .unwrap_or_else(Vec::new);
 
     if matches.is_present("template") {
@@ -155,7 +156,7 @@ pub fn matches_to_paths(matches: &ArgMatches<'_>, storage: &Storage<Project>) ->
 
         Ok(storage.search_projects_any(dir, &search_terms)?
             .iter()
-            .map(|project| project.dir())
+            .map(Storable::dir)
             .collect::<Vec<_>>())
     }
 }
@@ -168,7 +169,7 @@ pub fn bootstrap(matches: &ArgMatches<'_>) -> Result<(), Error> {
     let repo = matches.value_of("repo").unwrap();
     let editor = matches.value_of("editor")
                         .or_else(|| CONFIG.get("user.editor")
-                                   .and_then(|e|e.as_str()));
+                                   .and_then(Yaml::as_str));
 
     let default_to = get_storage_path()
         .to_str()
@@ -205,7 +206,7 @@ pub fn edit(matches: &ArgMatches<'_>) -> Result<(), Error> {
 
     let editor = matches.value_of("editor")
         .or_else(|| CONFIG.get("user/editor")
-                  .and_then(|e| e.as_str()));
+                  .and_then(Yaml::as_str));
 
     if matches.is_present("template") {
         with_templates(search_term,
@@ -237,7 +238,7 @@ fn edit_projects(dir: StorageDir, search_terms: &[&str], editor: Option<&str>) -
     if all_projects.is_empty() {
         bail!(ActionError::NothingFound(search_terms.iter().map(ToString::to_string).collect()));
     } else {
-        let all_paths = all_projects.iter().map(|p| p.file()).collect::<Vec<PathBuf>>();
+        let all_paths = all_projects.iter().map(Storable::file).collect::<Vec<PathBuf>>();
         util::pass_to_command(editor, &all_paths);
         Ok(())
     }
@@ -284,7 +285,7 @@ pub fn workspace(matches: &ArgMatches<'_>) -> Result<(), Error> {
 
     let editor = matches.value_of("editor")
         .or_else(|| CONFIG.get("user/editor")
-                  .and_then(|e| e.as_str()));
+                  .and_then(Yaml::as_str));
     util::pass_to_command(editor, &[storage.working_dir()]);
     Ok(())
 }
@@ -306,7 +307,7 @@ pub fn set(m: &ArgMatches<'_>) -> Result<(), Error> {
     let field = m.value_of("field name")
                             .unwrap()
                             .chars()
-                            .flat_map(|c| c.to_uppercase())
+                            .flat_map(char::to_uppercase)
                             .collect::<String>();
     let value = m.value_of("field value").unwrap();
     let (search_terms, dir) = matches_to_search(m);
@@ -363,7 +364,7 @@ fn infer_bill_type(m: &ArgMatches<'_>) -> Option<BillType> {
 fn matches_to_export_config<'a>(m: &'a ArgMatches<'_>) -> Option<ExportConfig<'a>> {
 
     let template_name = m.value_of("template")
-                         .or_else(||CONFIG.get("document_export/default_template").and_then(|e| e.as_str()))
+                         .or_else(||CONFIG.get("document_export/default_template").and_then(Yaml::as_str))
                          .unwrap();
     let bill_type = infer_bill_type(m);
 
@@ -466,7 +467,7 @@ pub fn unarchive(matches: &ArgMatches<'_>) -> Result<(), Error> {
 pub fn config(matches: &ArgMatches<'_>) -> Result<(), Error> {
     let editor = matches.value_of("editor")
                         .or_else(|| CONFIG.get("user.editor")
-                                  .and_then(|e|e.as_str()));
+                                  .and_then(Yaml::as_str));
 
     if let Some(path) = matches.value_of("show") {
         config_show(path)?;
diff --git a/src/config.rs b/src/config.rs
index 28872307d..c5a493b5c 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -71,7 +71,7 @@ impl ConfigReader {
 
     fn envify_path(path: &str) -> String {
         path.split(|c| c == '/' || c == '.')
-            .map(|word| word.to_uppercase())
+            .map(str::to_uppercase)
             .fold(String::from("ASCIII"), |mut acc, w| {
             acc.push_str("_");
             acc.push_str(&w);
@@ -133,7 +133,7 @@ impl ConfigReader {
             .as_vec()
             .map(|v| {
                      v.iter()
-                      .filter_map(|s| s.as_str())
+                      .filter_map(Yaml::as_str)
                       .collect()
                  })
     }
@@ -167,7 +167,7 @@ impl ConfigReader {
     /// You should have a default config for everything that you use.
     pub fn get_bool(&self, key: &str) -> bool {
         self.get(key)
-            .and_then(|y| y.as_bool())
+            .and_then(Yaml::as_bool)
             .unwrap_or_else(|| panic!("{}", format!("Config file {} in field {} does not contain a boolean value",
                              DEFAULT_LOCATION,
                              key)))
diff --git a/src/document_export/mod.rs b/src/document_export/mod.rs
index 6e4759a19..bf1296770 100644
--- a/src/document_export/mod.rs
+++ b/src/document_export/mod.rs
@@ -7,6 +7,7 @@ use std::path::{Path, PathBuf};
 
 use serde::ser::Serialize;
 use failure::{bail, Error};
+use yaml_rust::Yaml;
 
 use open;
 use handlebars::{Handlebars, no_escape, Helper, RenderContext, HelperDef, Context, Output, HelperResult};
@@ -58,7 +59,7 @@ struct CountHelper;
 impl HelperDef for CountHelper {
     #[allow(clippy::extra_unused_lifetimes)]
     fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'_, '_>, _: &Handlebars, _: &Context, _: &mut RenderContext<'_>, out: &mut dyn Output) -> HelperResult {
-        let count = h.param(0).unwrap().value().as_array().map_or(0, |a|a.len());
+        let count = h.param(0).unwrap().value().as_array().map_or(0, Vec::len);
         out.write(&format!("{}", count))?;
         Ok(())
     }
@@ -137,7 +138,7 @@ fn project_to_doc(project: &Project, config: &ExportConfig<'_>) -> Result<Option
                                 .expect("Faulty default config")
                                 .as_vec().expect("Faulty default config")
                                 .iter()
-                                .map(|v|v.as_str()).collect::<Vec<_>>();
+                                .map(Yaml::as_str).collect::<Vec<_>>();
 
     let  template_path = output_template_path(template_name)?;
     debug!("converting with {:?}", convert_tool);
diff --git a/src/project/computed_field.rs b/src/project/computed_field.rs
index 93c0a8f7f..337ec65f5 100644
--- a/src/project/computed_field.rs
+++ b/src/project/computed_field.rs
@@ -71,7 +71,7 @@ impl ComputedField {
         let storage = storage::get_storage_path();
 
         match *self {
-            ComputedField::Responsible => project.responsible().map(|s| s.to_owned()),
+            ComputedField::Responsible => project.responsible().map(ToOwned::to_owned),
             ComputedField::OfferNumber => project.offer().number(),
             ComputedField::InvoiceNumber => project.invoice().number_str(),
             ComputedField::InvoiceNumberLong => project.invoice().number_long_str(),
diff --git a/src/project/export.rs b/src/project/export.rs
index fb90d5c8d..1fe7c629f 100644
--- a/src/project/export.rs
+++ b/src/project/export.rs
@@ -11,7 +11,7 @@ pub trait ExportTarget<T> {
 }
 
 fn opt_str(opt: Option<&str>) -> Option<String> {
-    opt.map(|e| e.to_owned())
+    opt.map(ToOwned::to_owned)
 }
 
 #[derive(Debug, PartialEq)]
diff --git a/src/project/mod.rs b/src/project/mod.rs
index 8cbc845c5..664c73c53 100644
--- a/src/project/mod.rs
+++ b/src/project/mod.rs
@@ -611,7 +611,7 @@ impl Storable for Project {
 
     fn short_desc(&self) -> String {
         self.name()
-            .map(|n|n.to_owned())
+            .map(ToOwned::to_owned)
             .unwrap_or_else(|| format!("unnamed: {:?}",
                                        self.dir()
                                            .file_name()
@@ -652,7 +652,7 @@ impl Storable for Project {
         let project_file_extension = crate::CONFIG.get_to_string("extensions.project_file");
         let file_path = list_path_content(folder_path)?.iter()
             .filter(|f|f.extension().unwrap_or(&OsStr::new("")) == project_file_extension.as_str())
-            .nth(0).map(|b|b.to_owned())
+            .nth(0).map(ToOwned::to_owned)
             .ok_or_else(|| StorageError::NoProjectFile(folder_path.to_owned()))?;
         Self::open_file(&file_path)
     }
diff --git a/src/project/spec_yaml.rs b/src/project/spec_yaml.rs
index bf0176f9e..e16582c4a 100644
--- a/src/project/spec_yaml.rs
+++ b/src/project/spec_yaml.rs
@@ -82,20 +82,20 @@ pub trait ProvidesData {
     ///
     /// Same mentality as `yaml_rust`, only returns `Some`, if it's a `Yaml::String`.
     fn get_str<'a>(&'a self, path: &str) -> Option<&'a str> {
-        self.get(path).and_then(|y| y.as_str())
+        self.get(path).and_then(Yaml::as_str)
     }
 
     /// Gets an `Int` value.
     ///
     /// Same mentality as `yaml_rust`, only returns `Some`, if it's a `Yaml::Int`.
     fn get_int<'a>(&'a self, path: &str) -> Option<i64> {
-        self.get(path).and_then(|y| y.as_i64())
+        self.get(path).and_then(Yaml::as_i64)
     }
 
     /// Gets a Date in `dd.mm.YYYY` format.
     fn get_dmy(&self, path: &str) -> Option<Date<Utc>> {
         self.get(path)
-            .and_then(|y| y.as_str())
+            .and_then(Yaml::as_str)
             .and_then(|d| self.parse_dmy_date(d))
     }
 
@@ -150,7 +150,7 @@ pub trait ProvidesData {
     /// Gets `Some(Yaml::Hash)` or `None`.
     //pub fn get_hash<'a>(yaml:&'a Yaml, key:&str) -> Option<&'a BTreeMap<Yaml,Yaml>> {
     fn get_hash<'a>(&'a self, path: &str) -> Option<&'a YamlHash> {
-        self.get(path).and_then(|y| y.as_hash())
+        self.get(path).and_then(Yaml::as_hash)
     }
 
     /// Gets a `Float` value.
@@ -274,16 +274,16 @@ impl HasEvents for Project {
     #[allow(unused_qualifications)]
     fn events(&self) -> Option<Vec<spec::Event>> {
         let dates = ProvidesData::get(self, "event.dates/")
-            .and_then(|a| a.as_vec())?;
+            .and_then(Yaml::as_vec)?;
         dates.iter()
              .map(|h| {
 
             let begin = self.get_direct(h, "begin")
-                            .and_then(|y| y.as_str())
+                            .and_then(Yaml::as_str)
                             .and_then(|d| self.parse_dmy_date(d))?;
 
             let end = self.get_direct(h, "end")
-                          .and_then(|y| y.as_str())
+                          .and_then(Yaml::as_str)
                           .and_then(|d| self.parse_dmy_date(d));
 
             Some(spec::Event {
@@ -296,17 +296,17 @@ impl HasEvents for Project {
     }
 
     fn times(&self, yaml: &Yaml) -> Option<Vec<EventTime>> {
-        let times = self.get_direct(yaml, "times").and_then(|l| l.as_vec())?;
+        let times = self.get_direct(yaml, "times").and_then(Yaml::as_vec)?;
         times.iter()
              .map(|h| {
 
             let start = self.get_direct(h, "begin")
-                            .and_then(|y| y.as_str())
+                            .and_then(Yaml::as_str)
                             .or(Some("00.00"))
                             .and_then(util::naive_time_from_str);
 
             let end = self.get_direct(h, "end")
-                          .and_then(|y| y.as_str())
+                          .and_then(Yaml::as_str)
                           .and_then(util::naive_time_from_str)
                           .or(start); // TODO assume a duration of one hour instead
 
@@ -549,7 +549,7 @@ impl<'a> Offerable for Offer<'a> {
             .map(|s| format!("{}-{}", s, num))
 
         // old spec
-        .or_else(|| self.get_str("manumber").map(|s|s.to_string()))
+        .or_else(|| self.get_str("manumber").map(ToString::to_string))
     }
 }
 
diff --git a/src/storage/mod.rs b/src/storage/mod.rs
index 5dc16e1d0..baa9809db 100644
--- a/src/storage/mod.rs
+++ b/src/storage/mod.rs
@@ -144,7 +144,7 @@ pub fn list_path_content(path:&Path) -> Result<Vec<PathBuf>, Error> {
     }
 
     Ok(fs::read_dir(path)?
-        .filter_map(|entry| entry.ok())
+        .filter_map(Result::ok)
         .map(|entry| entry.path())
         .collect::<Vec<PathBuf>>())
 }
@@ -610,7 +610,7 @@ impl<L:Storable> Storage<L> {
 
         // must be in a dir that parses into a year
         let parent_is_num =  archived_dir.parent()
-            .and_then(|p| p.file_stem())
+            .and_then(Path::file_stem)
             .and_then(OsStr::to_str)
             .map_or(false, |s| s.parse::<i32>().is_ok());
 
@@ -695,7 +695,7 @@ impl<L:Storable> Storage<L> {
     fn get_project_dir_from_archive(&self, name:&str, year:Year) -> Result<PathBuf, Error> {
         for project_file in &self.list_project_files(StorageDir::Archive(year))?{
             if project_file.ends_with(slugify(name) + "."+ &L::file_extension()) {
-                return project_file.parent().map(|p|p.to_owned()).ok_or_else (|| StorageError::ProjectDoesNotExist.into());
+                return project_file.parent().map(ToOwned::to_owned).ok_or_else (|| StorageError::ProjectDoesNotExist.into());
             }
         }
         bail!(StorageError::ProjectDoesNotExist)
diff --git a/src/storage/storable.rs b/src/storage/storable.rs
index d2df53fbb..67dbe9ca7 100644
--- a/src/storage/storable.rs
+++ b/src/storage/storable.rs
@@ -29,7 +29,7 @@ pub trait Storable: Send+Sync {
     fn from_template(project_name: &str, template: &Path, data: &HashMap<&str, String>) -> Result<StorableAndTempDir<Self>, Error> where Self: Sized;
 
     /// For file names
-    fn ident(&self) -> String{ self.dir().file_stem().and_then(|s|s.to_str()).unwrap().to_owned() }
+    fn ident(&self) -> String{ self.dir().file_stem().and_then(std::ffi::OsStr::to_str).unwrap().to_owned() }
 
     fn short_desc(&self) -> String;
     fn modified_date(&self) -> Option<Date<Utc>>;
diff --git a/src/util/yaml.rs b/src/util/yaml.rs
index 37159c2cb..1746d25aa 100644
--- a/src/util/yaml.rs
+++ b/src/util/yaml.rs
@@ -39,7 +39,7 @@ pub fn parse(file_content: &str) -> Result<Yaml, failure::Error> {
     Ok(
         YamlLoader::load_from_str(&file_content)?
         .get(0)
-        .map(|i|i.to_owned())
+        .map(ToOwned::to_owned)
         .unwrap_or_else(||Yaml::from_str("[]"))
       )
 }
@@ -76,7 +76,7 @@ pub fn parse_dmy_date_range(date_str:&str) -> Option<Date<Utc>>{
 /// Gets `Some(Yaml::Hash)` or `None`.
 //pub fn get_hash<'a>(yaml:&'a Yaml, key:&str) -> Option<&'a BTreeMap<Yaml,Yaml>> {
 pub fn get_hash<'a>(yaml:&'a Yaml, key:&str) -> Option<&'a YamlHash> {
-    get(yaml,key).and_then(|y|y.as_hash())
+    get(yaml,key).and_then(Yaml::as_hash)
 }
 
 /// Gets a `Bool` value.
@@ -111,7 +111,7 @@ pub fn get_f64(yaml:&Yaml, key:&str) -> Option<f64> {
 ///
 /// Same mentality as `yaml_rust`, only returns `Some`, if it's a `Yaml::Int`.
 pub fn get_int(yaml:&Yaml, key:&str) -> Option<i64> {
-    get(yaml,key).and_then(|y|y.as_i64())
+    get(yaml,key).and_then(Yaml::as_i64)
 }
 
 //TODO this would be nice
@@ -123,7 +123,7 @@ pub fn get_int(yaml:&Yaml, key:&str) -> Option<i64> {
 ///
 /// Same mentality as `yaml_rust`, only returns `Some`, if it's a `Yaml::String`.
 pub fn get_str<'a>(yaml:&'a Yaml, key:&str) -> Option<&'a str> {
-    get(yaml,key).and_then(|y|y.as_str())
+    get(yaml,key).and_then(Yaml::as_str)
 }
 
 /// same as `get_str()`, but owned.
@@ -146,7 +146,7 @@ pub fn get_to_string(yaml:&Yaml, key:&str) -> Option<String> {
 
 /// Gets a Date in `dd.mm.YYYY` format.
 pub fn get_dmy(yaml:&Yaml, key:&str) -> Option<Date<Utc>> {
-    get(yaml,key).and_then(|y|y.as_str()).and_then(|d|parse_dmy_date(d))
+    get(yaml,key).and_then(Yaml::as_str).and_then(|d|parse_dmy_date(d))
 }
 
 /// Wrapper around `get_path()`.