diff --git a/nix/ircbot-carnix.nix b/nix/ircbot-carnix.nix
index 60eadb8..3d3ed91 100644
--- a/nix/ircbot-carnix.nix
+++ b/nix/ircbot-carnix.nix
@@ -1,4 +1,4 @@
-# Generated by carnix 0.5.2: carnix ./../ircbot/Cargo.lock --output ./ircbot-carnix.nix
+# Generated by carnix 0.5.0: carnix ./../ircbot/Cargo.lock --output ./ircbot-carnix.nix
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
     abi = buildPlatform.parsed.abi.name;
@@ -824,25 +824,24 @@ rec {
     dependencies = [ winapi_0_2_8 ];
     buildDependencies = [ winapi_build_0_1_1 ];
   };
-  winapi_0_2_8_features."default".from_advapi32_sys_0_2_0__default_ = true;
-  winapi_build_0_1_1_features."default".from_advapi32_sys_0_2_0__default_ = true;
+  winapi_0_2_8_features."default".from_advapi32_sys_0_2_0__default = true;
   aho_corasick_0_5_3 = aho_corasick_0_5_3_ rec {
     dependencies = [ memchr_0_1_11 ];
   };
-  memchr_0_1_11_features."default".from_aho_corasick_0_5_3__default_ = true;
+  memchr_0_1_11_features."default".from_aho_corasick_0_5_3__default = true;
   aho_corasick_0_6_4 = aho_corasick_0_6_4_ rec {
     dependencies = [ memchr_2_0_1 ];
   };
-  memchr_2_0_1_features."default".from_aho_corasick_0_6_4__default_ = true;
+  memchr_2_0_1_features."default".from_aho_corasick_0_6_4__default = true;
   amq_proto_0_1_0 = amq_proto_0_1_0_ rec {
     dependencies = [ bit_vec_0_4_4 byteorder_0_5_3 enum_primitive_0_1_1 env_logger_0_3_5 error_chain_0_10_0 log_0_3_8 ];
   };
-  bit_vec_0_4_4_features."default".from_amq_proto_0_1_0__default_ = true;
-  byteorder_0_5_3_features."default".from_amq_proto_0_1_0__default_ = true;
-  enum_primitive_0_1_1_features."default".from_amq_proto_0_1_0__default_ = true;
-  env_logger_0_3_5_features."default".from_amq_proto_0_1_0__default_ = true;
-  error_chain_0_10_0_features."default".from_amq_proto_0_1_0__default_ = true;
-  log_0_3_8_features."default".from_amq_proto_0_1_0__default_ = true;
+  bit_vec_0_4_4_features."default".from_amq_proto_0_1_0__default = true;
+  byteorder_0_5_3_features."default".from_amq_proto_0_1_0__default = true;
+  enum_primitive_0_1_1_features."default".from_amq_proto_0_1_0__default = true;
+  env_logger_0_3_5_features."default".from_amq_proto_0_1_0__default = true;
+  error_chain_0_10_0_features."default".from_amq_proto_0_1_0__default = true;
+  log_0_3_8_features."default".from_amq_proto_0_1_0__default = true;
   amqp_0_1_0 = amqp_0_1_0_ rec {
     dependencies = [ amq_proto_0_1_0 env_logger_0_3_5 log_0_3_8 openssl_0_9_22 url_1_6_0 ]
       ++ (if lib.lists.any (x: x == "openssl") features then [openssl_0_9_22] else []);
@@ -851,20 +850,18 @@ rec {
   amqp_0_1_0_features."".self = true;
   amqp_0_1_0_features."tls".self_default = hasDefault amqp_0_1_0_features;
   amqp_0_1_0_features."openssl".self_tls = hasFeature (amqp_0_1_0_features."tls" or {});
-  amq_proto_0_1_0_features."default".from_amqp_0_1_0__default_ = true;
-  env_logger_0_3_5_features."default".from_amqp_0_1_0__default_ = true;
-  log_0_3_8_features."default".from_amqp_0_1_0__default_ = true;
-  openssl_0_9_22_features."default".from_amqp_0_1_0__default_ = true;
-  url_1_6_0_features."default".from_amqp_0_1_0__default_ = true;
+  amq_proto_0_1_0_features."default".from_amqp_0_1_0__default = true;
+  env_logger_0_3_5_features."default".from_amqp_0_1_0__default = true;
+  log_0_3_8_features."default".from_amqp_0_1_0__default = true;
+  openssl_0_9_22_features."default".from_amqp_0_1_0__default = true;
+  url_1_6_0_features."default".from_amqp_0_1_0__default = true;
   backtrace_0_3_4 = backtrace_0_3_4_ rec {
     dependencies = [ cfg_if_0_1_2 rustc_demangle_0_1_5 ]
       ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then [ backtrace_sys_0_1_16 ]
       ++ (if lib.lists.any (x: x == "backtrace-sys") features then [backtrace_sys_0_1_16] else []) else [])
       ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_34 ] else [])
       ++ (if kernel == "windows" then [ dbghelp_sys_0_2_0 kernel32_sys_0_2_2 winapi_0_2_8 ]
-      ++ (if lib.lists.any (x: x == "dbghelp-sys") features then [dbghelp_sys_0_2_0] else [])
-      ++ (if lib.lists.any (x: x == "kernel32-sys") features then [kernel32_sys_0_2_2] else [])
-      ++ (if lib.lists.any (x: x == "winapi") features then [winapi_0_2_8] else []) else []);
+      ++ (if lib.lists.any (x: x == "dbghelp-sys") features then [dbghelp_sys_0_2_0] else [])      ++ (if lib.lists.any (x: x == "kernel32-sys") features then [kernel32_sys_0_2_2] else [])      ++ (if lib.lists.any (x: x == "winapi") features then [winapi_0_2_8] else []) else []);
     features = mkFeatures backtrace_0_3_4_features;
   };
   backtrace_0_3_4_features."".self = true;
@@ -882,25 +879,24 @@ rec {
   backtrace_0_3_4_features."rustc-serialize".self_serialize-rustc = hasFeature (backtrace_0_3_4_features."serialize-rustc" or {});
   backtrace_0_3_4_features."serde".self_serialize-serde = hasFeature (backtrace_0_3_4_features."serialize-serde" or {});
   backtrace_0_3_4_features."serde_derive".self_serialize-serde = hasFeature (backtrace_0_3_4_features."serialize-serde" or {});
-  addr2line_0_0_0_features."default".from_backtrace_0_3_4__default_ = true;
-  backtrace_sys_0_1_16_features."default".from_backtrace_0_3_4__default_ = true;
-  cfg_if_0_1_2_features."default".from_backtrace_0_3_4__default_ = true;
-  cpp_demangle_0_0_0_features."default".from_backtrace_0_3_4__default_ = false;
-  dbghelp_sys_0_2_0_features."default".from_backtrace_0_3_4__default_ = true;
-  findshlibs_0_0_0_features."default".from_backtrace_0_3_4__default_ = true;
-  kernel32_sys_0_2_2_features."default".from_backtrace_0_3_4__default_ = true;
-  libc_0_2_34_features."default".from_backtrace_0_3_4__default_ = true;
-  rustc_demangle_0_1_5_features."default".from_backtrace_0_3_4__default_ = true;
-  rustc_serialize_0_0_0_features."default".from_backtrace_0_3_4__default_ = true;
-  serde_0_0_0_features."default".from_backtrace_0_3_4__default_ = true;
-  serde_derive_0_0_0_features."default".from_backtrace_0_3_4__default_ = true;
-  winapi_0_2_8_features."default".from_backtrace_0_3_4__default_ = true;
+  addr2line_0_0_0_features."default".from_backtrace_0_3_4__default = true;
+  cfg_if_0_1_2_features."default".from_backtrace_0_3_4__default = true;
+  cpp_demangle_0_0_0_features."default".from_backtrace_0_3_4__default = false;
+  findshlibs_0_0_0_features."default".from_backtrace_0_3_4__default = true;
+  rustc_demangle_0_1_5_features."default".from_backtrace_0_3_4__default = true;
+  rustc_serialize_0_0_0_features."default".from_backtrace_0_3_4__default = true;
+  serde_0_0_0_features."default".from_backtrace_0_3_4__default = true;
+  serde_derive_0_0_0_features."default".from_backtrace_0_3_4__default = true;
+  backtrace_sys_0_1_16_features."default".from_backtrace_0_3_4__default = true;
+  libc_0_2_34_features."default".from_backtrace_0_3_4__default = true;
+  dbghelp_sys_0_2_0_features."default".from_backtrace_0_3_4__default = true;
+  kernel32_sys_0_2_2_features."default".from_backtrace_0_3_4__default = true;
+  winapi_0_2_8_features."default".from_backtrace_0_3_4__default = true;
   backtrace_sys_0_1_16 = backtrace_sys_0_1_16_ rec {
     dependencies = [ libc_0_2_34 ];
     buildDependencies = [ cc_1_0_3 ];
   };
-  cc_1_0_3_features."default".from_backtrace_sys_0_1_16__default_ = true;
-  libc_0_2_34_features."default".from_backtrace_sys_0_1_16__default_ = true;
+  libc_0_2_34_features."default".from_backtrace_sys_0_1_16__default = true;
   bit_vec_0_4_4 = bit_vec_0_4_4_ rec {
     features = mkFeatures bit_vec_0_4_4_features;
   };
@@ -916,8 +912,8 @@ rec {
   };
   bufstream_0_1_3_features."futures".self_tokio = hasFeature (bufstream_0_1_3_features."tokio" or {});
   bufstream_0_1_3_features."tokio-io".self_tokio = hasFeature (bufstream_0_1_3_features."tokio" or {});
-  futures_0_0_0_features."default".from_bufstream_0_1_3__default_ = true;
-  tokio_io_0_0_0_features."default".from_bufstream_0_1_3__default_ = true;
+  futures_0_0_0_features."default".from_bufstream_0_1_3__default = true;
+  tokio_io_0_0_0_features."default".from_bufstream_0_1_3__default = true;
   byteorder_0_5_3 = byteorder_0_5_3_ rec {
     features = mkFeatures byteorder_0_5_3_features;
   };
@@ -929,78 +925,76 @@ rec {
   bytes_0_4_5 = bytes_0_4_5_ rec {
     dependencies = [ byteorder_1_2_1 iovec_0_1_1 ];
   };
-  byteorder_1_2_1_features."default".from_bytes_0_4_5__default_ = true;
-  iovec_0_1_1_features."default".from_bytes_0_4_5__default_ = true;
-  serde_0_0_0_features."default".from_bytes_0_4_5__default_ = true;
+  byteorder_1_2_1_features."default".from_bytes_0_4_5__default = true;
+  iovec_0_1_1_features."default".from_bytes_0_4_5__default = true;
+  serde_0_0_0_features."default".from_bytes_0_4_5__default = true;
   cc_1_0_3 = cc_1_0_3_ rec {
     dependencies = [];
     features = mkFeatures cc_1_0_3_features;
   };
   cc_1_0_3_features."rayon".self_parallel = hasFeature (cc_1_0_3_features."parallel" or {});
-  rayon_0_0_0_features."default".from_cc_1_0_3__default_ = true;
+  rayon_0_0_0_features."default".from_cc_1_0_3__default = true;
   cfg_if_0_1_2 = cfg_if_0_1_2_ rec {};
   chrono_0_4_0 = chrono_0_4_0_ rec {
     dependencies = [ num_0_1_41 time_0_1_38 ];
   };
-  num_0_1_41_features."default".from_chrono_0_4_0__default_ = false;
-  rustc_serialize_0_0_0_features."default".from_chrono_0_4_0__default_ = true;
-  serde_0_0_0_features."default".from_chrono_0_4_0__default_ = true;
-  time_0_1_38_features."default".from_chrono_0_4_0__default_ = true;
+  num_0_1_41_features."default".from_chrono_0_4_0__default = false;
+  rustc_serialize_0_0_0_features."default".from_chrono_0_4_0__default = true;
+  serde_0_0_0_features."default".from_chrono_0_4_0__default = true;
+  time_0_1_38_features."default".from_chrono_0_4_0__default = true;
   core_foundation_0_2_3 = core_foundation_0_2_3_ rec {
     dependencies = [ core_foundation_sys_0_2_3 libc_0_2_34 ];
   };
-  core_foundation_sys_0_2_3_features."default".from_core_foundation_0_2_3__default_ = true;
-  libc_0_2_34_features."default".from_core_foundation_0_2_3__default_ = true;
+  core_foundation_sys_0_2_3_features."default".from_core_foundation_0_2_3__default = true;
+  libc_0_2_34_features."default".from_core_foundation_0_2_3__default = true;
   core_foundation_sys_0_2_3 = core_foundation_sys_0_2_3_ rec {
     dependencies = [ libc_0_2_34 ];
   };
-  libc_0_2_34_features."default".from_core_foundation_sys_0_2_3__default_ = true;
+  libc_0_2_34_features."default".from_core_foundation_sys_0_2_3__default = true;
   crypt32_sys_0_2_0 = crypt32_sys_0_2_0_ rec {
     dependencies = [ winapi_0_2_8 ];
     buildDependencies = [ winapi_build_0_1_1 ];
   };
-  winapi_0_2_8_features."default".from_crypt32_sys_0_2_0__default_ = true;
-  winapi_build_0_1_1_features."default".from_crypt32_sys_0_2_0__default_ = true;
+  winapi_0_2_8_features."default".from_crypt32_sys_0_2_0__default = true;
   dbghelp_sys_0_2_0 = dbghelp_sys_0_2_0_ rec {
     dependencies = [ winapi_0_2_8 ];
     buildDependencies = [ winapi_build_0_1_1 ];
   };
-  winapi_0_2_8_features."default".from_dbghelp_sys_0_2_0__default_ = true;
-  winapi_build_0_1_1_features."default".from_dbghelp_sys_0_2_0__default_ = true;
+  winapi_0_2_8_features."default".from_dbghelp_sys_0_2_0__default = true;
   dtoa_0_4_2 = dtoa_0_4_2_ rec {};
   encoding_0_2_33 = encoding_0_2_33_ rec {
     dependencies = [ encoding_index_japanese_1_20141219_5 encoding_index_korean_1_20141219_5 encoding_index_simpchinese_1_20141219_5 encoding_index_singlebyte_1_20141219_5 encoding_index_tradchinese_1_20141219_5 ];
   };
-  encoding_index_japanese_1_20141219_5_features."default".from_encoding_0_2_33__default_ = true;
-  encoding_index_korean_1_20141219_5_features."default".from_encoding_0_2_33__default_ = true;
-  encoding_index_simpchinese_1_20141219_5_features."default".from_encoding_0_2_33__default_ = true;
-  encoding_index_singlebyte_1_20141219_5_features."default".from_encoding_0_2_33__default_ = true;
-  encoding_index_tradchinese_1_20141219_5_features."default".from_encoding_0_2_33__default_ = true;
+  encoding_index_japanese_1_20141219_5_features."default".from_encoding_0_2_33__default = true;
+  encoding_index_korean_1_20141219_5_features."default".from_encoding_0_2_33__default = true;
+  encoding_index_simpchinese_1_20141219_5_features."default".from_encoding_0_2_33__default = true;
+  encoding_index_singlebyte_1_20141219_5_features."default".from_encoding_0_2_33__default = true;
+  encoding_index_tradchinese_1_20141219_5_features."default".from_encoding_0_2_33__default = true;
   encoding_index_japanese_1_20141219_5 = encoding_index_japanese_1_20141219_5_ rec {
     dependencies = [ encoding_index_tests_0_1_4 ];
   };
-  encoding_index_tests_0_1_4_features."default".from_encoding_index_japanese_1_20141219_5__default_ = true;
+  encoding_index_tests_0_1_4_features."default".from_encoding_index_japanese_1_20141219_5__default = true;
   encoding_index_korean_1_20141219_5 = encoding_index_korean_1_20141219_5_ rec {
     dependencies = [ encoding_index_tests_0_1_4 ];
   };
-  encoding_index_tests_0_1_4_features."default".from_encoding_index_korean_1_20141219_5__default_ = true;
+  encoding_index_tests_0_1_4_features."default".from_encoding_index_korean_1_20141219_5__default = true;
   encoding_index_simpchinese_1_20141219_5 = encoding_index_simpchinese_1_20141219_5_ rec {
     dependencies = [ encoding_index_tests_0_1_4 ];
   };
-  encoding_index_tests_0_1_4_features."default".from_encoding_index_simpchinese_1_20141219_5__default_ = true;
+  encoding_index_tests_0_1_4_features."default".from_encoding_index_simpchinese_1_20141219_5__default = true;
   encoding_index_singlebyte_1_20141219_5 = encoding_index_singlebyte_1_20141219_5_ rec {
     dependencies = [ encoding_index_tests_0_1_4 ];
   };
-  encoding_index_tests_0_1_4_features."default".from_encoding_index_singlebyte_1_20141219_5__default_ = true;
+  encoding_index_tests_0_1_4_features."default".from_encoding_index_singlebyte_1_20141219_5__default = true;
   encoding_index_tradchinese_1_20141219_5 = encoding_index_tradchinese_1_20141219_5_ rec {
     dependencies = [ encoding_index_tests_0_1_4 ];
   };
-  encoding_index_tests_0_1_4_features."default".from_encoding_index_tradchinese_1_20141219_5__default_ = true;
+  encoding_index_tests_0_1_4_features."default".from_encoding_index_tradchinese_1_20141219_5__default = true;
   encoding_index_tests_0_1_4 = encoding_index_tests_0_1_4_ rec {};
   enum_primitive_0_1_1 = enum_primitive_0_1_1_ rec {
     dependencies = [ num_traits_0_1_41 ];
   };
-  num_traits_0_1_41_features."default".from_enum_primitive_0_1_1__default_ = false;
+  num_traits_0_1_41_features."default".from_enum_primitive_0_1_1__default = false;
   env_logger_0_3_5 = env_logger_0_3_5_ rec {
     dependencies = [ log_0_3_8 regex_0_1_80 ]
       ++ (if lib.lists.any (x: x == "regex") features then [regex_0_1_80] else []);
@@ -1008,8 +1002,8 @@ rec {
   };
   env_logger_0_3_5_features."".self = true;
   env_logger_0_3_5_features."regex".self_default = hasDefault env_logger_0_3_5_features;
-  log_0_3_8_features."default".from_env_logger_0_3_5__default_ = true;
-  regex_0_1_80_features."default".from_env_logger_0_3_5__default_ = true;
+  log_0_3_8_features."default".from_env_logger_0_3_5__default = true;
+  regex_0_1_80_features."default".from_env_logger_0_3_5__default = true;
   env_logger_0_4_3 = env_logger_0_4_3_ rec {
     dependencies = [ log_0_3_8 regex_0_2_3 ]
       ++ (if lib.lists.any (x: x == "regex") features then [regex_0_2_3] else []);
@@ -1017,8 +1011,8 @@ rec {
   };
   env_logger_0_4_3_features."".self = true;
   env_logger_0_4_3_features."regex".self_default = hasDefault env_logger_0_4_3_features;
-  log_0_3_8_features."default".from_env_logger_0_4_3__default_ = true;
-  regex_0_2_3_features."default".from_env_logger_0_4_3__default_ = true;
+  log_0_3_8_features."default".from_env_logger_0_4_3__default = true;
+  regex_0_2_3_features."default".from_env_logger_0_4_3__default = true;
   error_chain_0_10_0 = error_chain_0_10_0_ rec {
     dependencies = [ backtrace_0_3_4 ]
       ++ (if lib.lists.any (x: x == "backtrace") features then [backtrace_0_3_4] else []);
@@ -1027,20 +1021,20 @@ rec {
   error_chain_0_10_0_features."".self = true;
   error_chain_0_10_0_features."backtrace".self_default = hasDefault error_chain_0_10_0_features;
   error_chain_0_10_0_features."example_generated".self_default = hasDefault error_chain_0_10_0_features;
-  backtrace_0_3_4_features."default".from_error_chain_0_10_0__default_ = true;
+  backtrace_0_3_4_features."default".from_error_chain_0_10_0__default = true;
   foreign_types_0_3_2 = foreign_types_0_3_2_ rec {
     dependencies = [ foreign_types_shared_0_1_1 ];
   };
-  foreign_types_shared_0_1_1_features."default".from_foreign_types_0_3_2__default_ = true;
+  foreign_types_shared_0_1_1_features."default".from_foreign_types_0_3_2__default = true;
   foreign_types_shared_0_1_1 = foreign_types_shared_0_1_1_ rec {};
   fuchsia_zircon_0_2_1 = fuchsia_zircon_0_2_1_ rec {
     dependencies = [ fuchsia_zircon_sys_0_2_0 ];
   };
-  fuchsia_zircon_sys_0_2_0_features."default".from_fuchsia_zircon_0_2_1__default_ = true;
+  fuchsia_zircon_sys_0_2_0_features."default".from_fuchsia_zircon_0_2_1__default = true;
   fuchsia_zircon_sys_0_2_0 = fuchsia_zircon_sys_0_2_0_ rec {
     dependencies = [ bitflags_0_7_0 ];
   };
-  bitflags_0_7_0_features."default".from_fuchsia_zircon_sys_0_2_0__default_ = true;
+  bitflags_0_7_0_features."default".from_fuchsia_zircon_sys_0_2_0__default = true;
   futures_0_1_17 = futures_0_1_17_ rec {
     features = mkFeatures futures_0_1_17_features;
   };
@@ -1049,19 +1043,18 @@ rec {
   idna_0_1_4 = idna_0_1_4_ rec {
     dependencies = [ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_5 ];
   };
-  matches_0_1_6_features."default".from_idna_0_1_4__default_ = true;
-  unicode_bidi_0_3_4_features."default".from_idna_0_1_4__default_ = true;
-  unicode_normalization_0_1_5_features."default".from_idna_0_1_4__default_ = true;
+  matches_0_1_6_features."default".from_idna_0_1_4__default = true;
+  unicode_bidi_0_3_4_features."default".from_idna_0_1_4__default = true;
+  unicode_normalization_0_1_5_features."default".from_idna_0_1_4__default = true;
   iovec_0_1_1 = iovec_0_1_1_ rec {
     dependencies = (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_34 ] else [])
       ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []);
   };
-  libc_0_2_34_features."default".from_iovec_0_1_1__default_ = true;
-  winapi_0_2_8_features."default".from_iovec_0_1_1__default_ = true;
+  libc_0_2_34_features."default".from_iovec_0_1_1__default = true;
+  winapi_0_2_8_features."default".from_iovec_0_1_1__default = true;
   irc_0_12_5 = irc_0_12_5_ rec {
     dependencies = [ bufstream_0_1_3 bytes_0_4_5 chrono_0_4_0 encoding_0_2_33 error_chain_0_10_0 futures_0_1_17 native_tls_0_1_4 serde_1_0_23 serde_derive_1_0_23 serde_json_1_0_7 tokio_core_0_1_10 tokio_io_0_1_4 tokio_mockstream_1_1_0 tokio_timer_0_1_2 tokio_tls_0_1_3 toml_0_4_5 ]
-      ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_1_0_7] else [])
-      ++ (if lib.lists.any (x: x == "toml") features then [toml_0_4_5] else []);
+      ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_1_0_7] else [])      ++ (if lib.lists.any (x: x == "toml") features then [toml_0_4_5] else []);
     features = mkFeatures irc_0_12_5_features;
   };
   irc_0_12_5_features."".self = true;
@@ -1070,34 +1063,34 @@ rec {
   irc_0_12_5_features."toml".self_default = hasDefault irc_0_12_5_features;
   irc_0_12_5_features."serde_json".self_json = hasFeature (irc_0_12_5_features."json" or {});
   irc_0_12_5_features."serde_yaml".self_yaml = hasFeature (irc_0_12_5_features."yaml" or {});
-  bufstream_0_1_3_features."default".from_irc_0_12_5__default_ = true;
-  bytes_0_4_5_features."default".from_irc_0_12_5__default_ = true;
-  chrono_0_4_0_features."default".from_irc_0_12_5__default_ = true;
-  encoding_0_2_33_features."default".from_irc_0_12_5__default_ = true;
-  error_chain_0_10_0_features."default".from_irc_0_12_5__default_ = true;
-  futures_0_1_17_features."default".from_irc_0_12_5__default_ = true;
-  native_tls_0_1_4_features."default".from_irc_0_12_5__default_ = true;
-  serde_1_0_23_features."default".from_irc_0_12_5__default_ = true;
-  serde_derive_1_0_23_features."default".from_irc_0_12_5__default_ = true;
-  serde_json_1_0_7_features."default".from_irc_0_12_5__default_ = true;
-  serde_yaml_0_0_0_features."default".from_irc_0_12_5__default_ = true;
-  tokio_core_0_1_10_features."default".from_irc_0_12_5__default_ = true;
-  tokio_io_0_1_4_features."default".from_irc_0_12_5__default_ = true;
-  tokio_mockstream_1_1_0_features."default".from_irc_0_12_5__default_ = true;
-  tokio_timer_0_1_2_features."default".from_irc_0_12_5__default_ = true;
-  tokio_tls_0_1_3_features."default".from_irc_0_12_5__default_ = true;
-  toml_0_4_5_features."default".from_irc_0_12_5__default_ = true;
+  bufstream_0_1_3_features."default".from_irc_0_12_5__default = true;
+  bytes_0_4_5_features."default".from_irc_0_12_5__default = true;
+  chrono_0_4_0_features."default".from_irc_0_12_5__default = true;
+  encoding_0_2_33_features."default".from_irc_0_12_5__default = true;
+  error_chain_0_10_0_features."default".from_irc_0_12_5__default = true;
+  futures_0_1_17_features."default".from_irc_0_12_5__default = true;
+  native_tls_0_1_4_features."default".from_irc_0_12_5__default = true;
+  serde_1_0_23_features."default".from_irc_0_12_5__default = true;
+  serde_derive_1_0_23_features."default".from_irc_0_12_5__default = true;
+  serde_json_1_0_7_features."default".from_irc_0_12_5__default = true;
+  serde_yaml_0_0_0_features."default".from_irc_0_12_5__default = true;
+  tokio_core_0_1_10_features."default".from_irc_0_12_5__default = true;
+  tokio_io_0_1_4_features."default".from_irc_0_12_5__default = true;
+  tokio_mockstream_1_1_0_features."default".from_irc_0_12_5__default = true;
+  tokio_timer_0_1_2_features."default".from_irc_0_12_5__default = true;
+  tokio_tls_0_1_3_features."default".from_irc_0_12_5__default = true;
+  toml_0_4_5_features."default".from_irc_0_12_5__default = true;
   ircbot_0_1_0 = ircbot_0_1_0_ rec {
     dependencies = [ amqp_0_1_0 env_logger_0_4_3 irc_0_12_5 log_0_3_8 serde_1_0_23 serde_derive_1_0_23 serde_json_1_0_7 toml_0_4_5 ];
   };
-  amqp_0_1_0_features."default".from_ircbot_0_1_0__default_ = true;
-  env_logger_0_4_3_features."default".from_ircbot_0_1_0__default_ = true;
-  irc_0_12_5_features."default".from_ircbot_0_1_0__default_ = true;
-  log_0_3_8_features."default".from_ircbot_0_1_0__default_ = true;
-  serde_1_0_23_features."default".from_ircbot_0_1_0__default_ = true;
-  serde_derive_1_0_23_features."default".from_ircbot_0_1_0__default_ = true;
-  serde_json_1_0_7_features."default".from_ircbot_0_1_0__default_ = true;
-  toml_0_4_5_features."default".from_ircbot_0_1_0__default_ = true;
+  amqp_0_1_0_features."default".from_ircbot_0_1_0__default = true;
+  env_logger_0_4_3_features."default".from_ircbot_0_1_0__default = true;
+  irc_0_12_5_features."default".from_ircbot_0_1_0__default = true;
+  log_0_3_8_features."default".from_ircbot_0_1_0__default = true;
+  serde_1_0_23_features."default".from_ircbot_0_1_0__default = true;
+  serde_derive_1_0_23_features."default".from_ircbot_0_1_0__default = true;
+  serde_json_1_0_7_features."default".from_ircbot_0_1_0__default = true;
+  toml_0_4_5_features."default".from_ircbot_0_1_0__default = true;
   itoa_0_3_4 = itoa_0_3_4_ rec {
     features = mkFeatures itoa_0_3_4_features;
   };
@@ -1106,8 +1099,7 @@ rec {
     dependencies = [ winapi_0_2_8 ];
     buildDependencies = [ winapi_build_0_1_1 ];
   };
-  winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default_ = true;
-  winapi_build_0_1_1_features."default".from_kernel32_sys_0_2_2__default_ = true;
+  winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true;
   lazy_static_0_2_11 = lazy_static_0_2_11_ rec {
     dependencies = [];
     features = mkFeatures lazy_static_0_2_11_features;
@@ -1115,8 +1107,8 @@ rec {
   lazy_static_0_2_11_features."compiletest_rs".self_compiletest = hasFeature (lazy_static_0_2_11_features."compiletest" or {});
   lazy_static_0_2_11_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {});
   lazy_static_0_2_11_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {});
-  compiletest_rs_0_0_0_features."default".from_lazy_static_0_2_11__default_ = true;
-  spin_0_0_0_features."default".from_lazy_static_0_2_11__default_ = true;
+  compiletest_rs_0_0_0_features."default".from_lazy_static_0_2_11__default = true;
+  spin_0_0_0_features."default".from_lazy_static_0_2_11__default = true;
   lazy_static_1_0_0 = lazy_static_1_0_0_ rec {
     dependencies = [];
     features = mkFeatures lazy_static_1_0_0_features;
@@ -1124,15 +1116,15 @@ rec {
   lazy_static_1_0_0_features."compiletest_rs".self_compiletest = hasFeature (lazy_static_1_0_0_features."compiletest" or {});
   lazy_static_1_0_0_features."nightly".self_spin_no_std = hasFeature (lazy_static_1_0_0_features."spin_no_std" or {});
   lazy_static_1_0_0_features."spin".self_spin_no_std = hasFeature (lazy_static_1_0_0_features."spin_no_std" or {});
-  compiletest_rs_0_0_0_features."default".from_lazy_static_1_0_0__default_ = true;
-  spin_0_0_0_features."default".from_lazy_static_1_0_0__default_ = true;
+  compiletest_rs_0_0_0_features."default".from_lazy_static_1_0_0__default = true;
+  spin_0_0_0_features."default".from_lazy_static_1_0_0__default = true;
   lazycell_0_5_1 = lazycell_0_5_1_ rec {
     dependencies = [];
     features = mkFeatures lazycell_0_5_1_features;
   };
   lazycell_0_5_1_features."clippy".self_nightly-testing = hasFeature (lazycell_0_5_1_features."nightly-testing" or {});
   lazycell_0_5_1_features."nightly".self_nightly-testing = hasFeature (lazycell_0_5_1_features."nightly-testing" or {});
-  clippy_0_0_0_features."default".from_lazycell_0_5_1__default_ = true;
+  clippy_0_0_0_features."default".from_lazycell_0_5_1__default = true;
   libc_0_2_34 = libc_0_2_34_ rec {
     features = mkFeatures libc_0_2_34_features;
   };
@@ -1145,7 +1137,7 @@ rec {
   memchr_0_1_11 = memchr_0_1_11_ rec {
     dependencies = [ libc_0_2_34 ];
   };
-  libc_0_2_34_features."default".from_memchr_0_1_11__default_ = true;
+  libc_0_2_34_features."default".from_memchr_0_1_11__default = true;
   memchr_2_0_1 = memchr_2_0_1_ rec {
     dependencies = [ libc_0_2_34 ]
       ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_34] else []);
@@ -1156,7 +1148,7 @@ rec {
   memchr_2_0_1_features."libc".self_default = hasDefault memchr_2_0_1_features;
   memchr_2_0_1_features."libc".self_use_std = hasFeature (memchr_2_0_1_features."use_std" or {});
   libc_0_2_34_features."use_std".from_memchr_2_0_1__use_std = hasFeature (memchr_2_0_1_features."use_std" or {});
-  libc_0_2_34_features."default".from_memchr_2_0_1__default_ = false;
+  libc_0_2_34_features."default".from_memchr_2_0_1__default = false;
   mio_0_6_11 = mio_0_6_11_ rec {
     dependencies = [ iovec_0_1_1 lazycell_0_5_1 log_0_3_8 net2_0_2_31 slab_0_3_0 ]
       ++ (if kernel == "fuchsia" then [ fuchsia_zircon_0_2_1 fuchsia_zircon_sys_0_2_0 ] else [])
@@ -1165,35 +1157,35 @@ rec {
     features = mkFeatures mio_0_6_11_features;
   };
   mio_0_6_11_features."with-deprecated".self_default = hasDefault mio_0_6_11_features;
-  fuchsia_zircon_0_2_1_features."default".from_mio_0_6_11__default_ = true;
-  fuchsia_zircon_sys_0_2_0_features."default".from_mio_0_6_11__default_ = true;
-  iovec_0_1_1_features."default".from_mio_0_6_11__default_ = true;
-  kernel32_sys_0_2_2_features."default".from_mio_0_6_11__default_ = true;
-  lazycell_0_5_1_features."default".from_mio_0_6_11__default_ = true;
-  libc_0_2_34_features."default".from_mio_0_6_11__default_ = true;
-  log_0_3_8_features."default".from_mio_0_6_11__default_ = true;
-  miow_0_2_1_features."default".from_mio_0_6_11__default_ = true;
-  net2_0_2_31_features."default".from_mio_0_6_11__default_ = true;
-  slab_0_3_0_features."default".from_mio_0_6_11__default_ = true;
-  winapi_0_2_8_features."default".from_mio_0_6_11__default_ = true;
+  iovec_0_1_1_features."default".from_mio_0_6_11__default = true;
+  lazycell_0_5_1_features."default".from_mio_0_6_11__default = true;
+  log_0_3_8_features."default".from_mio_0_6_11__default = true;
+  net2_0_2_31_features."default".from_mio_0_6_11__default = true;
+  slab_0_3_0_features."default".from_mio_0_6_11__default = true;
+  fuchsia_zircon_0_2_1_features."default".from_mio_0_6_11__default = true;
+  fuchsia_zircon_sys_0_2_0_features."default".from_mio_0_6_11__default = true;
+  libc_0_2_34_features."default".from_mio_0_6_11__default = true;
+  kernel32_sys_0_2_2_features."default".from_mio_0_6_11__default = true;
+  miow_0_2_1_features."default".from_mio_0_6_11__default = true;
+  winapi_0_2_8_features."default".from_mio_0_6_11__default = true;
   miow_0_2_1 = miow_0_2_1_ rec {
     dependencies = [ kernel32_sys_0_2_2 net2_0_2_31 winapi_0_2_8 ws2_32_sys_0_2_1 ];
   };
-  kernel32_sys_0_2_2_features."default".from_miow_0_2_1__default_ = true;
-  net2_0_2_31_features."default".from_miow_0_2_1__default_ = false;
-  winapi_0_2_8_features."default".from_miow_0_2_1__default_ = true;
-  ws2_32_sys_0_2_1_features."default".from_miow_0_2_1__default_ = true;
+  kernel32_sys_0_2_2_features."default".from_miow_0_2_1__default = true;
+  net2_0_2_31_features."default".from_miow_0_2_1__default = false;
+  winapi_0_2_8_features."default".from_miow_0_2_1__default = true;
+  ws2_32_sys_0_2_1_features."default".from_miow_0_2_1__default = true;
   native_tls_0_1_4 = native_tls_0_1_4_ rec {
     dependencies = (if !(kernel == "windows" || kernel == "darwin") then [ openssl_0_9_22 ] else [])
       ++ (if kernel == "darwin" then [ security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_5 ] else [])
       ++ (if kernel == "windows" then [ schannel_0_1_9 ] else []);
   };
+  openssl_0_9_22_features."default".from_native_tls_0_1_4__default = true;
   security_framework_0_1_16_features."OSX_10_8".from_native_tls_0_1_4 = true;
-  openssl_0_9_22_features."default".from_native_tls_0_1_4__default_ = true;
-  schannel_0_1_9_features."default".from_native_tls_0_1_4__default_ = true;
-  security_framework_0_1_16_features."default".from_native_tls_0_1_4__default_ = true;
-  security_framework_sys_0_1_16_features."default".from_native_tls_0_1_4__default_ = true;
-  tempdir_0_3_5_features."default".from_native_tls_0_1_4__default_ = true;
+  security_framework_0_1_16_features."default".from_native_tls_0_1_4__default = true;
+  security_framework_sys_0_1_16_features."default".from_native_tls_0_1_4__default = true;
+  tempdir_0_3_5_features."default".from_native_tls_0_1_4__default = true;
+  schannel_0_1_9_features."default".from_native_tls_0_1_4__default = true;
   net2_0_2_31 = net2_0_2_31_ rec {
     dependencies = [ cfg_if_0_1_2 ]
       ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_34 ] else [])
@@ -1205,11 +1197,11 @@ rec {
     features = mkFeatures net2_0_2_31_features;
   };
   net2_0_2_31_features."duration".self_default = hasDefault net2_0_2_31_features;
-  cfg_if_0_1_2_features."default".from_net2_0_2_31__default_ = true;
-  kernel32_sys_0_2_2_features."default".from_net2_0_2_31__default_ = true;
-  libc_0_2_34_features."default".from_net2_0_2_31__default_ = true;
-  winapi_0_2_8_features."default".from_net2_0_2_31__default_ = true;
-  ws2_32_sys_0_2_1_features."default".from_net2_0_2_31__default_ = true;
+  cfg_if_0_1_2_features."default".from_net2_0_2_31__default = true;
+  libc_0_2_34_features."default".from_net2_0_2_31__default = true;
+  kernel32_sys_0_2_2_features."default".from_net2_0_2_31__default = true;
+  winapi_0_2_8_features."default".from_net2_0_2_31__default = true;
+  ws2_32_sys_0_2_1_features."default".from_net2_0_2_31__default = true;
   num_0_1_41 = num_0_1_41_ rec {
     dependencies = [ num_integer_0_1_35 num_iter_0_1_34 num_traits_0_1_41 ];
     features = mkFeatures num_0_1_41_features;
@@ -1223,44 +1215,42 @@ rec {
   num_0_1_41_features."num-rational".self_rational = hasFeature (num_0_1_41_features."rational" or {});
   num_bigint_0_0_0_features."rustc-serialize".from_num_0_1_41__rustc-serialize = hasFeature (num_0_1_41_features."rustc-serialize" or {});
   num_bigint_0_0_0_features."serde".from_num_0_1_41__serde = hasFeature (num_0_1_41_features."serde" or {});
+  num_bigint_0_0_0_features."default".from_num_0_1_41__default = true;
   num_complex_0_0_0_features."rustc-serialize".from_num_0_1_41__rustc-serialize = hasFeature (num_0_1_41_features."rustc-serialize" or {});
   num_complex_0_0_0_features."serde".from_num_0_1_41__serde = hasFeature (num_0_1_41_features."serde" or {});
+  num_complex_0_0_0_features."default".from_num_0_1_41__default = true;
+  num_integer_0_1_35_features."default".from_num_0_1_41__default = true;
+  num_iter_0_1_34_features."default".from_num_0_1_41__default = true;
   num_rational_0_0_0_features."rustc-serialize".from_num_0_1_41__rustc-serialize = hasFeature (num_0_1_41_features."rustc-serialize" or {});
   num_rational_0_0_0_features."serde".from_num_0_1_41__serde = hasFeature (num_0_1_41_features."serde" or {});
-  num_bigint_0_0_0_features."default".from_num_0_1_41__default_ = true;
-  num_complex_0_0_0_features."default".from_num_0_1_41__default_ = true;
-  num_integer_0_1_35_features."default".from_num_0_1_41__default_ = true;
-  num_iter_0_1_34_features."default".from_num_0_1_41__default_ = true;
-  num_rational_0_0_0_features."default".from_num_0_1_41__default_ = true;
-  num_traits_0_1_41_features."default".from_num_0_1_41__default_ = true;
+  num_rational_0_0_0_features."default".from_num_0_1_41__default = true;
+  num_traits_0_1_41_features."default".from_num_0_1_41__default = true;
   num_integer_0_1_35 = num_integer_0_1_35_ rec {
     dependencies = [ num_traits_0_1_41 ];
   };
-  num_traits_0_1_41_features."default".from_num_integer_0_1_35__default_ = true;
+  num_traits_0_1_41_features."default".from_num_integer_0_1_35__default = true;
   num_iter_0_1_34 = num_iter_0_1_34_ rec {
     dependencies = [ num_integer_0_1_35 num_traits_0_1_41 ];
   };
-  num_integer_0_1_35_features."default".from_num_iter_0_1_34__default_ = true;
-  num_traits_0_1_41_features."default".from_num_iter_0_1_34__default_ = true;
+  num_integer_0_1_35_features."default".from_num_iter_0_1_34__default = true;
+  num_traits_0_1_41_features."default".from_num_iter_0_1_34__default = true;
   num_traits_0_1_41 = num_traits_0_1_41_ rec {};
   openssl_0_9_22 = openssl_0_9_22_ rec {
     dependencies = [ bitflags_0_9_1 foreign_types_0_3_2 lazy_static_0_2_11 libc_0_2_34 openssl_sys_0_9_22 ];
     features = mkFeatures openssl_0_9_22_features;
   };
   openssl_0_9_22_features."".self = true;
-  bitflags_0_9_1_features."default".from_openssl_0_9_22__default_ = true;
-  foreign_types_0_3_2_features."default".from_openssl_0_9_22__default_ = true;
-  lazy_static_0_2_11_features."default".from_openssl_0_9_22__default_ = true;
-  libc_0_2_34_features."default".from_openssl_0_9_22__default_ = true;
-  openssl_sys_0_9_22_features."default".from_openssl_0_9_22__default_ = true;
+  bitflags_0_9_1_features."default".from_openssl_0_9_22__default = true;
+  foreign_types_0_3_2_features."default".from_openssl_0_9_22__default = true;
+  lazy_static_0_2_11_features."default".from_openssl_0_9_22__default = true;
+  libc_0_2_34_features."default".from_openssl_0_9_22__default = true;
+  openssl_sys_0_9_22_features."default".from_openssl_0_9_22__default = true;
   openssl_sys_0_9_22 = openssl_sys_0_9_22_ rec {
     dependencies = [ libc_0_2_34 ]
       ++ (if abi == "msvc" then [] else []);
     buildDependencies = [ cc_1_0_3 pkg_config_0_3_9 ];
   };
-  cc_1_0_3_features."default".from_openssl_sys_0_9_22__default_ = true;
-  libc_0_2_34_features."default".from_openssl_sys_0_9_22__default_ = true;
-  pkg_config_0_3_9_features."default".from_openssl_sys_0_9_22__default_ = true;
+  libc_0_2_34_features."default".from_openssl_sys_0_9_22__default = true;
   percent_encoding_1_0_1 = percent_encoding_1_0_1_ rec {};
   pkg_config_0_3_9 = pkg_config_0_3_9_ rec {};
   quote_0_3_15 = quote_0_3_15_ rec {};
@@ -1270,31 +1260,31 @@ rec {
     features = mkFeatures rand_0_3_18_features;
   };
   rand_0_3_18_features."i128_support".self_nightly = hasFeature (rand_0_3_18_features."nightly" or {});
-  fuchsia_zircon_0_2_1_features."default".from_rand_0_3_18__default_ = true;
-  libc_0_2_34_features."default".from_rand_0_3_18__default_ = true;
+  libc_0_2_34_features."default".from_rand_0_3_18__default = true;
+  fuchsia_zircon_0_2_1_features."default".from_rand_0_3_18__default = true;
   redox_syscall_0_1_32 = redox_syscall_0_1_32_ rec {};
   regex_0_1_80 = regex_0_1_80_ rec {
     dependencies = [ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ];
     features = mkFeatures regex_0_1_80_features;
   };
   regex_0_1_80_features."simd".self_simd-accel = hasFeature (regex_0_1_80_features."simd-accel" or {});
-  aho_corasick_0_5_3_features."default".from_regex_0_1_80__default_ = true;
-  memchr_0_1_11_features."default".from_regex_0_1_80__default_ = true;
-  regex_syntax_0_3_9_features."default".from_regex_0_1_80__default_ = true;
-  simd_0_0_0_features."default".from_regex_0_1_80__default_ = true;
-  thread_local_0_2_7_features."default".from_regex_0_1_80__default_ = true;
-  utf8_ranges_0_1_3_features."default".from_regex_0_1_80__default_ = true;
+  aho_corasick_0_5_3_features."default".from_regex_0_1_80__default = true;
+  memchr_0_1_11_features."default".from_regex_0_1_80__default = true;
+  regex_syntax_0_3_9_features."default".from_regex_0_1_80__default = true;
+  simd_0_0_0_features."default".from_regex_0_1_80__default = true;
+  thread_local_0_2_7_features."default".from_regex_0_1_80__default = true;
+  utf8_ranges_0_1_3_features."default".from_regex_0_1_80__default = true;
   regex_0_2_3 = regex_0_2_3_ rec {
     dependencies = [ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ];
     features = mkFeatures regex_0_2_3_features;
   };
   regex_0_2_3_features."simd".self_simd-accel = hasFeature (regex_0_2_3_features."simd-accel" or {});
-  aho_corasick_0_6_4_features."default".from_regex_0_2_3__default_ = true;
-  memchr_2_0_1_features."default".from_regex_0_2_3__default_ = true;
-  regex_syntax_0_4_1_features."default".from_regex_0_2_3__default_ = true;
-  simd_0_0_0_features."default".from_regex_0_2_3__default_ = true;
-  thread_local_0_3_4_features."default".from_regex_0_2_3__default_ = true;
-  utf8_ranges_1_0_0_features."default".from_regex_0_2_3__default_ = true;
+  aho_corasick_0_6_4_features."default".from_regex_0_2_3__default = true;
+  memchr_2_0_1_features."default".from_regex_0_2_3__default = true;
+  regex_syntax_0_4_1_features."default".from_regex_0_2_3__default = true;
+  simd_0_0_0_features."default".from_regex_0_2_3__default = true;
+  thread_local_0_3_4_features."default".from_regex_0_2_3__default = true;
+  utf8_ranges_1_0_0_features."default".from_regex_0_2_3__default = true;
   regex_syntax_0_3_9 = regex_syntax_0_3_9_ rec {};
   regex_syntax_0_4_1 = regex_syntax_0_4_1_ rec {};
   rustc_demangle_0_1_5 = rustc_demangle_0_1_5_ rec {};
@@ -1302,20 +1292,18 @@ rec {
     dependencies = [ advapi32_sys_0_2_0 crypt32_sys_0_2_0 kernel32_sys_0_2_2 lazy_static_1_0_0 secur32_sys_0_2_0 winapi_0_2_8 ];
     buildDependencies = [ winapi_build_0_1_1 ];
   };
-  advapi32_sys_0_2_0_features."default".from_schannel_0_1_9__default_ = true;
-  crypt32_sys_0_2_0_features."default".from_schannel_0_1_9__default_ = true;
-  kernel32_sys_0_2_2_features."default".from_schannel_0_1_9__default_ = true;
-  lazy_static_1_0_0_features."default".from_schannel_0_1_9__default_ = true;
-  secur32_sys_0_2_0_features."default".from_schannel_0_1_9__default_ = true;
-  winapi_0_2_8_features."default".from_schannel_0_1_9__default_ = true;
-  winapi_build_0_1_1_features."default".from_schannel_0_1_9__default_ = true;
+  advapi32_sys_0_2_0_features."default".from_schannel_0_1_9__default = true;
+  crypt32_sys_0_2_0_features."default".from_schannel_0_1_9__default = true;
+  kernel32_sys_0_2_2_features."default".from_schannel_0_1_9__default = true;
+  lazy_static_1_0_0_features."default".from_schannel_0_1_9__default = true;
+  secur32_sys_0_2_0_features."default".from_schannel_0_1_9__default = true;
+  winapi_0_2_8_features."default".from_schannel_0_1_9__default = true;
   scoped_tls_0_1_0 = scoped_tls_0_1_0_ rec {};
   secur32_sys_0_2_0 = secur32_sys_0_2_0_ rec {
     dependencies = [ winapi_0_2_8 ];
     buildDependencies = [ winapi_build_0_1_1 ];
   };
-  winapi_0_2_8_features."default".from_secur32_sys_0_2_0__default_ = true;
-  winapi_build_0_1_1_features."default".from_secur32_sys_0_2_0__default_ = true;
+  winapi_0_2_8_features."default".from_secur32_sys_0_2_0__default = true;
   security_framework_0_1_16 = security_framework_0_1_16_ rec {
     dependencies = [ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_34 security_framework_sys_0_1_16 ];
     features = mkFeatures security_framework_0_1_16_features;
@@ -1324,15 +1312,15 @@ rec {
   security_framework_0_1_16_features."OSX_10_10".self_OSX_10_11 = hasFeature (security_framework_0_1_16_features."OSX_10_11" or {});
   security_framework_0_1_16_features."OSX_10_11".self_OSX_10_12 = hasFeature (security_framework_0_1_16_features."OSX_10_12" or {});
   security_framework_0_1_16_features."OSX_10_8".self_OSX_10_9 = hasFeature (security_framework_0_1_16_features."OSX_10_9" or {});
+  core_foundation_0_2_3_features."default".from_security_framework_0_1_16__default = true;
+  core_foundation_sys_0_2_3_features."default".from_security_framework_0_1_16__default = true;
+  libc_0_2_34_features."default".from_security_framework_0_1_16__default = true;
   security_framework_sys_0_1_16_features."OSX_10_10".from_security_framework_0_1_16__OSX_10_10 = hasFeature (security_framework_0_1_16_features."OSX_10_10" or {});
   security_framework_sys_0_1_16_features."OSX_10_11".from_security_framework_0_1_16__OSX_10_11 = hasFeature (security_framework_0_1_16_features."OSX_10_11" or {});
   security_framework_sys_0_1_16_features."OSX_10_11".from_security_framework_0_1_16__OSX_10_12 = hasFeature (security_framework_0_1_16_features."OSX_10_12" or {});
   security_framework_sys_0_1_16_features."OSX_10_8".from_security_framework_0_1_16__OSX_10_8 = hasFeature (security_framework_0_1_16_features."OSX_10_8" or {});
   security_framework_sys_0_1_16_features."OSX_10_9".from_security_framework_0_1_16__OSX_10_9 = hasFeature (security_framework_0_1_16_features."OSX_10_9" or {});
-  core_foundation_0_2_3_features."default".from_security_framework_0_1_16__default_ = true;
-  core_foundation_sys_0_2_3_features."default".from_security_framework_0_1_16__default_ = true;
-  libc_0_2_34_features."default".from_security_framework_0_1_16__default_ = true;
-  security_framework_sys_0_1_16_features."default".from_security_framework_0_1_16__default_ = true;
+  security_framework_sys_0_1_16_features."default".from_security_framework_0_1_16__default = true;
   security_framework_sys_0_1_16 = security_framework_sys_0_1_16_ rec {
     dependencies = [ core_foundation_sys_0_2_3 libc_0_2_34 ];
     features = mkFeatures security_framework_sys_0_1_16_features;
@@ -1341,8 +1329,8 @@ rec {
   security_framework_sys_0_1_16_features."OSX_10_10".self_OSX_10_11 = hasFeature (security_framework_sys_0_1_16_features."OSX_10_11" or {});
   security_framework_sys_0_1_16_features."OSX_10_11".self_OSX_10_12 = hasFeature (security_framework_sys_0_1_16_features."OSX_10_12" or {});
   security_framework_sys_0_1_16_features."OSX_10_8".self_OSX_10_9 = hasFeature (security_framework_sys_0_1_16_features."OSX_10_9" or {});
-  core_foundation_sys_0_2_3_features."default".from_security_framework_sys_0_1_16__default_ = true;
-  libc_0_2_34_features."default".from_security_framework_sys_0_1_16__default_ = true;
+  core_foundation_sys_0_2_3_features."default".from_security_framework_sys_0_1_16__default = true;
+  libc_0_2_34_features."default".from_security_framework_sys_0_1_16__default = true;
   serde_1_0_23 = serde_1_0_23_ rec {
     dependencies = [];
     features = mkFeatures serde_1_0_23_features;
@@ -1351,37 +1339,35 @@ rec {
   serde_1_0_23_features."std".self_default = hasDefault serde_1_0_23_features;
   serde_1_0_23_features."serde_derive".self_derive = hasFeature (serde_1_0_23_features."derive" or {});
   serde_1_0_23_features."serde_derive".self_playground = hasFeature (serde_1_0_23_features."playground" or {});
-  serde_derive_0_0_0_features."default".from_serde_1_0_23__default_ = true;
+  serde_derive_0_0_0_features."default".from_serde_1_0_23__default = true;
   serde_derive_1_0_23 = serde_derive_1_0_23_ rec {
     dependencies = [ quote_0_3_15 serde_derive_internals_0_17_0 syn_0_11_11 ];
   };
+  quote_0_3_15_features."default".from_serde_derive_1_0_23__default = true;
+  serde_derive_internals_0_17_0_features."default".from_serde_derive_1_0_23__default = false;
   syn_0_11_11_features."visit".from_serde_derive_1_0_23 = true;
-  quote_0_3_15_features."default".from_serde_derive_1_0_23__default_ = true;
-  serde_derive_internals_0_17_0_features."default".from_serde_derive_1_0_23__default_ = false;
-  syn_0_11_11_features."default".from_serde_derive_1_0_23__default_ = true;
+  syn_0_11_11_features."default".from_serde_derive_1_0_23__default = true;
   serde_derive_internals_0_17_0 = serde_derive_internals_0_17_0_ rec {
     dependencies = [ syn_0_11_11 synom_0_11_3 ];
   };
   syn_0_11_11_features."parsing".from_serde_derive_internals_0_17_0 = true;
-  syn_0_11_11_features."default".from_serde_derive_internals_0_17_0__default_ = false;
-  synom_0_11_3_features."default".from_serde_derive_internals_0_17_0__default_ = true;
+  syn_0_11_11_features."default".from_serde_derive_internals_0_17_0__default = false;
+  synom_0_11_3_features."default".from_serde_derive_internals_0_17_0__default = true;
   serde_json_1_0_7 = serde_json_1_0_7_ rec {
     dependencies = [ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_41 serde_1_0_23 ];
     features = mkFeatures serde_json_1_0_7_features;
   };
   serde_json_1_0_7_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_1_0_7_features."preserve_order" or {});
-  dtoa_0_4_2_features."default".from_serde_json_1_0_7__default_ = true;
-  itoa_0_3_4_features."default".from_serde_json_1_0_7__default_ = true;
-  linked_hash_map_0_0_0_features."default".from_serde_json_1_0_7__default_ = true;
-  num_traits_0_1_41_features."default".from_serde_json_1_0_7__default_ = true;
-  serde_1_0_23_features."default".from_serde_json_1_0_7__default_ = true;
+  dtoa_0_4_2_features."default".from_serde_json_1_0_7__default = true;
+  itoa_0_3_4_features."default".from_serde_json_1_0_7__default = true;
+  linked_hash_map_0_0_0_features."default".from_serde_json_1_0_7__default = true;
+  num_traits_0_1_41_features."default".from_serde_json_1_0_7__default = true;
+  serde_1_0_23_features."default".from_serde_json_1_0_7__default = true;
   slab_0_3_0 = slab_0_3_0_ rec {};
   slab_0_4_0 = slab_0_4_0_ rec {};
   syn_0_11_11 = syn_0_11_11_ rec {
     dependencies = [ quote_0_3_15 synom_0_11_3 unicode_xid_0_0_4 ]
-      ++ (if lib.lists.any (x: x == "quote") features then [quote_0_3_15] else [])
-      ++ (if lib.lists.any (x: x == "synom") features then [synom_0_11_3] else [])
-      ++ (if lib.lists.any (x: x == "unicode-xid") features then [unicode_xid_0_0_4] else []);
+      ++ (if lib.lists.any (x: x == "quote") features then [quote_0_3_15] else [])      ++ (if lib.lists.any (x: x == "synom") features then [synom_0_11_3] else [])      ++ (if lib.lists.any (x: x == "unicode-xid") features then [unicode_xid_0_0_4] else []);
     features = mkFeatures syn_0_11_11_features;
   };
   syn_0_11_11_features."".self = true;
@@ -1390,83 +1376,83 @@ rec {
   syn_0_11_11_features."unicode-xid".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {});
   syn_0_11_11_features."synom".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {});
   syn_0_11_11_features."quote".self_printing = hasFeature (syn_0_11_11_features."printing" or {});
-  quote_0_3_15_features."default".from_syn_0_11_11__default_ = true;
-  synom_0_11_3_features."default".from_syn_0_11_11__default_ = true;
-  unicode_xid_0_0_4_features."default".from_syn_0_11_11__default_ = true;
+  quote_0_3_15_features."default".from_syn_0_11_11__default = true;
+  synom_0_11_3_features."default".from_syn_0_11_11__default = true;
+  unicode_xid_0_0_4_features."default".from_syn_0_11_11__default = true;
   synom_0_11_3 = synom_0_11_3_ rec {
     dependencies = [ unicode_xid_0_0_4 ];
   };
-  unicode_xid_0_0_4_features."default".from_synom_0_11_3__default_ = true;
+  unicode_xid_0_0_4_features."default".from_synom_0_11_3__default = true;
   tempdir_0_3_5 = tempdir_0_3_5_ rec {
     dependencies = [ rand_0_3_18 ];
   };
-  rand_0_3_18_features."default".from_tempdir_0_3_5__default_ = true;
+  rand_0_3_18_features."default".from_tempdir_0_3_5__default = true;
   thread_id_2_0_0 = thread_id_2_0_0_ rec {
     dependencies = [ kernel32_sys_0_2_2 libc_0_2_34 ];
   };
-  kernel32_sys_0_2_2_features."default".from_thread_id_2_0_0__default_ = true;
-  libc_0_2_34_features."default".from_thread_id_2_0_0__default_ = true;
+  kernel32_sys_0_2_2_features."default".from_thread_id_2_0_0__default = true;
+  libc_0_2_34_features."default".from_thread_id_2_0_0__default = true;
   thread_local_0_2_7 = thread_local_0_2_7_ rec {
     dependencies = [ thread_id_2_0_0 ];
   };
-  thread_id_2_0_0_features."default".from_thread_local_0_2_7__default_ = true;
+  thread_id_2_0_0_features."default".from_thread_local_0_2_7__default = true;
   thread_local_0_3_4 = thread_local_0_3_4_ rec {
     dependencies = [ lazy_static_0_2_11 unreachable_1_0_0 ];
   };
-  lazy_static_0_2_11_features."default".from_thread_local_0_3_4__default_ = true;
-  unreachable_1_0_0_features."default".from_thread_local_0_3_4__default_ = true;
+  lazy_static_0_2_11_features."default".from_thread_local_0_3_4__default = true;
+  unreachable_1_0_0_features."default".from_thread_local_0_3_4__default = true;
   time_0_1_38 = time_0_1_38_ rec {
     dependencies = [ libc_0_2_34 ]
       ++ (if kernel == "redox" then [ redox_syscall_0_1_32 ] else [])
       ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []);
   };
-  kernel32_sys_0_2_2_features."default".from_time_0_1_38__default_ = true;
-  libc_0_2_34_features."default".from_time_0_1_38__default_ = true;
-  redox_syscall_0_1_32_features."default".from_time_0_1_38__default_ = true;
-  rustc_serialize_0_0_0_features."default".from_time_0_1_38__default_ = true;
-  winapi_0_2_8_features."default".from_time_0_1_38__default_ = true;
+  libc_0_2_34_features."default".from_time_0_1_38__default = true;
+  rustc_serialize_0_0_0_features."default".from_time_0_1_38__default = true;
+  redox_syscall_0_1_32_features."default".from_time_0_1_38__default = true;
+  kernel32_sys_0_2_2_features."default".from_time_0_1_38__default = true;
+  winapi_0_2_8_features."default".from_time_0_1_38__default = true;
   tokio_core_0_1_10 = tokio_core_0_1_10_ rec {
     dependencies = [ bytes_0_4_5 futures_0_1_17 iovec_0_1_1 log_0_3_8 mio_0_6_11 scoped_tls_0_1_0 slab_0_4_0 tokio_io_0_1_4 ];
   };
-  bytes_0_4_5_features."default".from_tokio_core_0_1_10__default_ = true;
-  futures_0_1_17_features."default".from_tokio_core_0_1_10__default_ = true;
-  iovec_0_1_1_features."default".from_tokio_core_0_1_10__default_ = true;
-  log_0_3_8_features."default".from_tokio_core_0_1_10__default_ = true;
-  mio_0_6_11_features."default".from_tokio_core_0_1_10__default_ = true;
-  scoped_tls_0_1_0_features."default".from_tokio_core_0_1_10__default_ = true;
-  slab_0_4_0_features."default".from_tokio_core_0_1_10__default_ = true;
-  tokio_io_0_1_4_features."default".from_tokio_core_0_1_10__default_ = true;
+  bytes_0_4_5_features."default".from_tokio_core_0_1_10__default = true;
+  futures_0_1_17_features."default".from_tokio_core_0_1_10__default = true;
+  iovec_0_1_1_features."default".from_tokio_core_0_1_10__default = true;
+  log_0_3_8_features."default".from_tokio_core_0_1_10__default = true;
+  mio_0_6_11_features."default".from_tokio_core_0_1_10__default = true;
+  scoped_tls_0_1_0_features."default".from_tokio_core_0_1_10__default = true;
+  slab_0_4_0_features."default".from_tokio_core_0_1_10__default = true;
+  tokio_io_0_1_4_features."default".from_tokio_core_0_1_10__default = true;
   tokio_io_0_1_4 = tokio_io_0_1_4_ rec {
     dependencies = [ bytes_0_4_5 futures_0_1_17 log_0_3_8 ];
   };
-  bytes_0_4_5_features."default".from_tokio_io_0_1_4__default_ = true;
-  futures_0_1_17_features."default".from_tokio_io_0_1_4__default_ = true;
-  log_0_3_8_features."default".from_tokio_io_0_1_4__default_ = true;
+  bytes_0_4_5_features."default".from_tokio_io_0_1_4__default = true;
+  futures_0_1_17_features."default".from_tokio_io_0_1_4__default = true;
+  log_0_3_8_features."default".from_tokio_io_0_1_4__default = true;
   tokio_mockstream_1_1_0 = tokio_mockstream_1_1_0_ rec {
     dependencies = [ futures_0_1_17 tokio_io_0_1_4 ];
   };
-  futures_0_1_17_features."default".from_tokio_mockstream_1_1_0__default_ = true;
-  tokio_io_0_1_4_features."default".from_tokio_mockstream_1_1_0__default_ = true;
+  futures_0_1_17_features."default".from_tokio_mockstream_1_1_0__default = true;
+  tokio_io_0_1_4_features."default".from_tokio_mockstream_1_1_0__default = true;
   tokio_timer_0_1_2 = tokio_timer_0_1_2_ rec {
     dependencies = [ futures_0_1_17 slab_0_3_0 ];
   };
-  futures_0_1_17_features."default".from_tokio_timer_0_1_2__default_ = true;
-  slab_0_3_0_features."default".from_tokio_timer_0_1_2__default_ = true;
+  futures_0_1_17_features."default".from_tokio_timer_0_1_2__default = true;
+  slab_0_3_0_features."default".from_tokio_timer_0_1_2__default = true;
   tokio_tls_0_1_3 = tokio_tls_0_1_3_ rec {
     dependencies = [ futures_0_1_17 native_tls_0_1_4 tokio_core_0_1_10 tokio_io_0_1_4 ]
       ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then [] else [])
       ++ (if kernel == "darwin" || kernel == "ios" then [] else [])
       ++ (if kernel == "windows" then [] else []);
   };
-  futures_0_1_17_features."default".from_tokio_tls_0_1_3__default_ = true;
-  native_tls_0_1_4_features."default".from_tokio_tls_0_1_3__default_ = true;
-  tokio_core_0_1_10_features."default".from_tokio_tls_0_1_3__default_ = true;
-  tokio_io_0_1_4_features."default".from_tokio_tls_0_1_3__default_ = true;
-  tokio_proto_0_0_0_features."default".from_tokio_tls_0_1_3__default_ = true;
+  futures_0_1_17_features."default".from_tokio_tls_0_1_3__default = true;
+  native_tls_0_1_4_features."default".from_tokio_tls_0_1_3__default = true;
+  tokio_core_0_1_10_features."default".from_tokio_tls_0_1_3__default = true;
+  tokio_io_0_1_4_features."default".from_tokio_tls_0_1_3__default = true;
+  tokio_proto_0_0_0_features."default".from_tokio_tls_0_1_3__default = true;
   toml_0_4_5 = toml_0_4_5_ rec {
     dependencies = [ serde_1_0_23 ];
   };
-  serde_1_0_23_features."default".from_toml_0_4_5__default_ = true;
+  serde_1_0_23_features."default".from_toml_0_4_5__default = true;
   unicode_bidi_0_3_4 = unicode_bidi_0_3_4_ rec {
     dependencies = [ matches_0_1_6 ];
     features = mkFeatures unicode_bidi_0_3_4_features;
@@ -1474,11 +1460,11 @@ rec {
   unicode_bidi_0_3_4_features."flame".self_flame_it = hasFeature (unicode_bidi_0_3_4_features."flame_it" or {});
   unicode_bidi_0_3_4_features."flamer".self_flame_it = hasFeature (unicode_bidi_0_3_4_features."flame_it" or {});
   unicode_bidi_0_3_4_features."serde".self_with_serde = hasFeature (unicode_bidi_0_3_4_features."with_serde" or {});
+  flame_0_0_0_features."default".from_unicode_bidi_0_3_4__default = true;
+  flamer_0_0_0_features."default".from_unicode_bidi_0_3_4__default = true;
+  matches_0_1_6_features."default".from_unicode_bidi_0_3_4__default = true;
   serde_0_0_0_features."derive".from_unicode_bidi_0_3_4 = true;
-  flame_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true;
-  flamer_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true;
-  matches_0_1_6_features."default".from_unicode_bidi_0_3_4__default_ = true;
-  serde_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true;
+  serde_0_0_0_features."default".from_unicode_bidi_0_3_4__default = true;
   unicode_normalization_0_1_5 = unicode_normalization_0_1_5_ rec {};
   unicode_xid_0_0_4 = unicode_xid_0_0_4_ rec {
     features = mkFeatures unicode_xid_0_0_4_features;
@@ -1487,20 +1473,20 @@ rec {
   unreachable_1_0_0 = unreachable_1_0_0_ rec {
     dependencies = [ void_1_0_2 ];
   };
-  void_1_0_2_features."default".from_unreachable_1_0_0__default_ = false;
+  void_1_0_2_features."default".from_unreachable_1_0_0__default = false;
   url_1_6_0 = url_1_6_0_ rec {
     dependencies = [ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_1 ];
     features = mkFeatures url_1_6_0_features;
   };
   url_1_6_0_features."heapsize".self_heap_size = hasFeature (url_1_6_0_features."heap_size" or {});
   url_1_6_0_features."encoding".self_query_encoding = hasFeature (url_1_6_0_features."query_encoding" or {});
-  encoding_0_0_0_features."default".from_url_1_6_0__default_ = true;
-  heapsize_0_0_0_features."default".from_url_1_6_0__default_ = true;
-  idna_0_1_4_features."default".from_url_1_6_0__default_ = true;
-  matches_0_1_6_features."default".from_url_1_6_0__default_ = true;
-  percent_encoding_1_0_1_features."default".from_url_1_6_0__default_ = true;
-  rustc_serialize_0_0_0_features."default".from_url_1_6_0__default_ = true;
-  serde_0_0_0_features."default".from_url_1_6_0__default_ = true;
+  encoding_0_0_0_features."default".from_url_1_6_0__default = true;
+  heapsize_0_0_0_features."default".from_url_1_6_0__default = true;
+  idna_0_1_4_features."default".from_url_1_6_0__default = true;
+  matches_0_1_6_features."default".from_url_1_6_0__default = true;
+  percent_encoding_1_0_1_features."default".from_url_1_6_0__default = true;
+  rustc_serialize_0_0_0_features."default".from_url_1_6_0__default = true;
+  serde_0_0_0_features."default".from_url_1_6_0__default = true;
   utf8_ranges_0_1_3 = utf8_ranges_0_1_3_ rec {};
   utf8_ranges_1_0_0 = utf8_ranges_1_0_0_ rec {};
   vcpkg_0_2_2 = vcpkg_0_2_2_ rec {};
@@ -1514,6 +1500,5 @@ rec {
     dependencies = [ winapi_0_2_8 ];
     buildDependencies = [ winapi_build_0_1_1 ];
   };
-  winapi_0_2_8_features."default".from_ws2_32_sys_0_2_1__default_ = true;
-  winapi_build_0_1_1_features."default".from_ws2_32_sys_0_2_1__default_ = true;
+  winapi_0_2_8_features."default".from_ws2_32_sys_0_2_1__default = true;
 }
diff --git a/nix/ofborg-carnix.nix b/nix/ofborg-carnix.nix
index f2e13e3..e4e4998 100644
--- a/nix/ofborg-carnix.nix
+++ b/nix/ofborg-carnix.nix
@@ -1,4 +1,4 @@
-# Generated by carnix 0.5.2: carnix ./../ofborg/Cargo.lock --output ./ofborg-carnix.nix
+# Generated by carnix 0.5.0: carnix ./../ofborg/Cargo.lock --output ./ofborg-carnix.nix
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
     abi = buildPlatform.parsed.abi.name;
@@ -300,6 +300,13 @@ let kernel = buildPlatform.parsed.kernel.name;
       sha256 = "01633h4yfqm0s302fm0dlba469bx8y6cs4nqc8bqrmjqxfxn515l";
       inherit dependencies buildDependencies features;
     };
+    linked_hash_map_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+      crateName = "linked-hash-map";
+      version = "0.4.2";
+      authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ];
+      sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl";
+      inherit dependencies buildDependencies features;
+    };
     log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
       crateName = "log";
       version = "0.3.8";
@@ -307,6 +314,13 @@ let kernel = buildPlatform.parsed.kernel.name;
       sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006";
       inherit dependencies buildDependencies features;
     };
+    lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+      crateName = "lru-cache";
+      version = "0.1.1";
+      authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" ];
+      sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw";
+      inherit dependencies buildDependencies features;
+    };
     matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
       crateName = "matches";
       version = "0.1.6";
@@ -718,20 +732,20 @@ rec {
   aho_corasick_0_5_3 = aho_corasick_0_5_3_ rec {
     dependencies = [ memchr_0_1_11 ];
   };
-  memchr_0_1_11_features."default".from_aho_corasick_0_5_3__default_ = true;
+  memchr_0_1_11_features."default".from_aho_corasick_0_5_3__default = true;
   aho_corasick_0_6_4 = aho_corasick_0_6_4_ rec {
     dependencies = [ memchr_2_0_1 ];
   };
-  memchr_2_0_1_features."default".from_aho_corasick_0_6_4__default_ = true;
+  memchr_2_0_1_features."default".from_aho_corasick_0_6_4__default = true;
   amq_proto_0_1_0 = amq_proto_0_1_0_ rec {
     dependencies = [ bit_vec_0_4_4 byteorder_0_5_3 enum_primitive_0_1_1 env_logger_0_3_5 error_chain_0_10_0 log_0_3_8 ];
   };
-  bit_vec_0_4_4_features."default".from_amq_proto_0_1_0__default_ = true;
-  byteorder_0_5_3_features."default".from_amq_proto_0_1_0__default_ = true;
-  enum_primitive_0_1_1_features."default".from_amq_proto_0_1_0__default_ = true;
-  env_logger_0_3_5_features."default".from_amq_proto_0_1_0__default_ = true;
-  error_chain_0_10_0_features."default".from_amq_proto_0_1_0__default_ = true;
-  log_0_3_8_features."default".from_amq_proto_0_1_0__default_ = true;
+  bit_vec_0_4_4_features."default".from_amq_proto_0_1_0__default = true;
+  byteorder_0_5_3_features."default".from_amq_proto_0_1_0__default = true;
+  enum_primitive_0_1_1_features."default".from_amq_proto_0_1_0__default = true;
+  env_logger_0_3_5_features."default".from_amq_proto_0_1_0__default = true;
+  error_chain_0_10_0_features."default".from_amq_proto_0_1_0__default = true;
+  log_0_3_8_features."default".from_amq_proto_0_1_0__default = true;
   amqp_0_1_0 = amqp_0_1_0_ rec {
     dependencies = [ amq_proto_0_1_0 env_logger_0_3_5 log_0_3_8 openssl_0_9_23 time_0_1_39 url_1_6_0 ]
       ++ (if lib.lists.any (x: x == "openssl") features then [openssl_0_9_23] else []);
@@ -740,12 +754,12 @@ rec {
   amqp_0_1_0_features."".self = true;
   amqp_0_1_0_features."tls".self_default = hasDefault amqp_0_1_0_features;
   amqp_0_1_0_features."openssl".self_tls = hasFeature (amqp_0_1_0_features."tls" or {});
-  amq_proto_0_1_0_features."default".from_amqp_0_1_0__default_ = true;
-  env_logger_0_3_5_features."default".from_amqp_0_1_0__default_ = true;
-  log_0_3_8_features."default".from_amqp_0_1_0__default_ = true;
-  openssl_0_9_23_features."default".from_amqp_0_1_0__default_ = true;
-  time_0_1_39_features."default".from_amqp_0_1_0__default_ = true;
-  url_1_6_0_features."default".from_amqp_0_1_0__default_ = true;
+  amq_proto_0_1_0_features."default".from_amqp_0_1_0__default = true;
+  env_logger_0_3_5_features."default".from_amqp_0_1_0__default = true;
+  log_0_3_8_features."default".from_amqp_0_1_0__default = true;
+  openssl_0_9_23_features."default".from_amqp_0_1_0__default = true;
+  time_0_1_39_features."default".from_amqp_0_1_0__default = true;
+  url_1_6_0_features."default".from_amqp_0_1_0__default = true;
   antidote_1_0_0 = antidote_1_0_0_ rec {};
   backtrace_0_3_5 = backtrace_0_3_5_ rec {
     dependencies = [ cfg_if_0_1_2 rustc_demangle_0_1_5 ]
@@ -769,33 +783,32 @@ rec {
   backtrace_0_3_5_features."rustc-serialize".self_serialize-rustc = hasFeature (backtrace_0_3_5_features."serialize-rustc" or {});
   backtrace_0_3_5_features."serde".self_serialize-serde = hasFeature (backtrace_0_3_5_features."serialize-serde" or {});
   backtrace_0_3_5_features."serde_derive".self_serialize-serde = hasFeature (backtrace_0_3_5_features."serialize-serde" or {});
+  addr2line_0_0_0_features."default".from_backtrace_0_3_5__default = true;
+  cfg_if_0_1_2_features."default".from_backtrace_0_3_5__default = true;
+  cpp_demangle_0_0_0_features."default".from_backtrace_0_3_5__default = false;
+  findshlibs_0_0_0_features."default".from_backtrace_0_3_5__default = true;
+  rustc_demangle_0_1_5_features."default".from_backtrace_0_3_5__default = true;
+  rustc_serialize_0_0_0_features."default".from_backtrace_0_3_5__default = true;
+  serde_0_0_0_features."default".from_backtrace_0_3_5__default = true;
+  serde_derive_0_0_0_features."default".from_backtrace_0_3_5__default = true;
+  backtrace_sys_0_1_16_features."default".from_backtrace_0_3_5__default = true;
+  libc_0_2_36_features."default".from_backtrace_0_3_5__default = true;
   winapi_0_3_4_features."std".from_backtrace_0_3_5 = true;
   winapi_0_3_4_features."dbghelp".from_backtrace_0_3_5 = true;
   winapi_0_3_4_features."processthreadsapi".from_backtrace_0_3_5 = true;
   winapi_0_3_4_features."winnt".from_backtrace_0_3_5 = true;
   winapi_0_3_4_features."minwindef".from_backtrace_0_3_5 = true;
-  addr2line_0_0_0_features."default".from_backtrace_0_3_5__default_ = true;
-  backtrace_sys_0_1_16_features."default".from_backtrace_0_3_5__default_ = true;
-  cfg_if_0_1_2_features."default".from_backtrace_0_3_5__default_ = true;
-  cpp_demangle_0_0_0_features."default".from_backtrace_0_3_5__default_ = false;
-  findshlibs_0_0_0_features."default".from_backtrace_0_3_5__default_ = true;
-  libc_0_2_36_features."default".from_backtrace_0_3_5__default_ = true;
-  rustc_demangle_0_1_5_features."default".from_backtrace_0_3_5__default_ = true;
-  rustc_serialize_0_0_0_features."default".from_backtrace_0_3_5__default_ = true;
-  serde_0_0_0_features."default".from_backtrace_0_3_5__default_ = true;
-  serde_derive_0_0_0_features."default".from_backtrace_0_3_5__default_ = true;
-  winapi_0_3_4_features."default".from_backtrace_0_3_5__default_ = true;
+  winapi_0_3_4_features."default".from_backtrace_0_3_5__default = true;
   backtrace_sys_0_1_16 = backtrace_sys_0_1_16_ rec {
     dependencies = [ libc_0_2_36 ];
     buildDependencies = [ cc_1_0_4 ];
   };
-  cc_1_0_4_features."default".from_backtrace_sys_0_1_16__default_ = true;
-  libc_0_2_36_features."default".from_backtrace_sys_0_1_16__default_ = true;
+  libc_0_2_36_features."default".from_backtrace_sys_0_1_16__default = true;
   base64_0_6_0 = base64_0_6_0_ rec {
     dependencies = [ byteorder_1_2_1 safemem_0_2_0 ];
   };
-  byteorder_1_2_1_features."default".from_base64_0_6_0__default_ = true;
-  safemem_0_2_0_features."default".from_base64_0_6_0__default_ = true;
+  byteorder_1_2_1_features."default".from_base64_0_6_0__default = true;
+  safemem_0_2_0_features."default".from_base64_0_6_0__default = true;
   bit_vec_0_4_4 = bit_vec_0_4_4_ rec {
     features = mkFeatures bit_vec_0_4_4_features;
   };
@@ -821,22 +834,22 @@ rec {
     features = mkFeatures cc_1_0_4_features;
   };
   cc_1_0_4_features."rayon".self_parallel = hasFeature (cc_1_0_4_features."parallel" or {});
-  rayon_0_0_0_features."default".from_cc_1_0_4__default_ = true;
+  rayon_0_0_0_features."default".from_cc_1_0_4__default = true;
   cfg_if_0_1_2 = cfg_if_0_1_2_ rec {};
   core_foundation_0_2_3 = core_foundation_0_2_3_ rec {
     dependencies = [ core_foundation_sys_0_2_3 libc_0_2_36 ];
   };
-  core_foundation_sys_0_2_3_features."default".from_core_foundation_0_2_3__default_ = true;
-  libc_0_2_36_features."default".from_core_foundation_0_2_3__default_ = true;
+  core_foundation_sys_0_2_3_features."default".from_core_foundation_0_2_3__default = true;
+  libc_0_2_36_features."default".from_core_foundation_0_2_3__default = true;
   core_foundation_sys_0_2_3 = core_foundation_sys_0_2_3_ rec {
     dependencies = [ libc_0_2_36 ];
   };
-  libc_0_2_36_features."default".from_core_foundation_sys_0_2_3__default_ = true;
+  libc_0_2_36_features."default".from_core_foundation_sys_0_2_3__default = true;
   dtoa_0_4_2 = dtoa_0_4_2_ rec {};
   enum_primitive_0_1_1 = enum_primitive_0_1_1_ rec {
     dependencies = [ num_traits_0_1_41 ];
   };
-  num_traits_0_1_41_features."default".from_enum_primitive_0_1_1__default_ = false;
+  num_traits_0_1_41_features."default".from_enum_primitive_0_1_1__default = false;
   env_logger_0_3_5 = env_logger_0_3_5_ rec {
     dependencies = [ log_0_3_8 regex_0_1_80 ]
       ++ (if lib.lists.any (x: x == "regex") features then [regex_0_1_80] else []);
@@ -844,8 +857,8 @@ rec {
   };
   env_logger_0_3_5_features."".self = true;
   env_logger_0_3_5_features."regex".self_default = hasDefault env_logger_0_3_5_features;
-  log_0_3_8_features."default".from_env_logger_0_3_5__default_ = true;
-  regex_0_1_80_features."default".from_env_logger_0_3_5__default_ = true;
+  log_0_3_8_features."default".from_env_logger_0_3_5__default = true;
+  regex_0_1_80_features."default".from_env_logger_0_3_5__default = true;
   env_logger_0_4_3 = env_logger_0_4_3_ rec {
     dependencies = [ log_0_3_8 regex_0_2_5 ]
       ++ (if lib.lists.any (x: x == "regex") features then [regex_0_2_5] else []);
@@ -853,8 +866,8 @@ rec {
   };
   env_logger_0_4_3_features."".self = true;
   env_logger_0_4_3_features."regex".self_default = hasDefault env_logger_0_4_3_features;
-  log_0_3_8_features."default".from_env_logger_0_4_3__default_ = true;
-  regex_0_2_5_features."default".from_env_logger_0_4_3__default_ = true;
+  log_0_3_8_features."default".from_env_logger_0_4_3__default = true;
+  regex_0_2_5_features."default".from_env_logger_0_4_3__default = true;
   error_chain_0_10_0 = error_chain_0_10_0_ rec {
     dependencies = [ backtrace_0_3_5 ]
       ++ (if lib.lists.any (x: x == "backtrace") features then [backtrace_0_3_5] else []);
@@ -863,29 +876,29 @@ rec {
   error_chain_0_10_0_features."".self = true;
   error_chain_0_10_0_features."backtrace".self_default = hasDefault error_chain_0_10_0_features;
   error_chain_0_10_0_features."example_generated".self_default = hasDefault error_chain_0_10_0_features;
-  backtrace_0_3_5_features."default".from_error_chain_0_10_0__default_ = true;
+  backtrace_0_3_5_features."default".from_error_chain_0_10_0__default = true;
   foreign_types_0_3_2 = foreign_types_0_3_2_ rec {
     dependencies = [ foreign_types_shared_0_1_1 ];
   };
-  foreign_types_shared_0_1_1_features."default".from_foreign_types_0_3_2__default_ = true;
+  foreign_types_shared_0_1_1_features."default".from_foreign_types_0_3_2__default = true;
   foreign_types_shared_0_1_1 = foreign_types_shared_0_1_1_ rec {};
   fs2_0_4_3 = fs2_0_4_3_ rec {
     dependencies = (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_36 ] else [])
       ++ (if kernel == "windows" then [ winapi_0_3_4 ] else []);
   };
+  libc_0_2_36_features."default".from_fs2_0_4_3__default = true;
   winapi_0_3_4_features."handleapi".from_fs2_0_4_3 = true;
   winapi_0_3_4_features."processthreadsapi".from_fs2_0_4_3 = true;
   winapi_0_3_4_features."winerror".from_fs2_0_4_3 = true;
   winapi_0_3_4_features."fileapi".from_fs2_0_4_3 = true;
   winapi_0_3_4_features."winbase".from_fs2_0_4_3 = true;
   winapi_0_3_4_features."std".from_fs2_0_4_3 = true;
-  libc_0_2_36_features."default".from_fs2_0_4_3__default_ = true;
-  winapi_0_3_4_features."default".from_fs2_0_4_3__default_ = true;
+  winapi_0_3_4_features."default".from_fs2_0_4_3__default = true;
   fuchsia_zircon_0_3_3 = fuchsia_zircon_0_3_3_ rec {
     dependencies = [ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ];
   };
-  bitflags_1_0_1_features."default".from_fuchsia_zircon_0_3_3__default_ = true;
-  fuchsia_zircon_sys_0_3_3_features."default".from_fuchsia_zircon_0_3_3__default_ = true;
+  bitflags_1_0_1_features."default".from_fuchsia_zircon_0_3_3__default = true;
+  fuchsia_zircon_sys_0_3_3_features."default".from_fuchsia_zircon_0_3_3__default = true;
   fuchsia_zircon_sys_0_3_3 = fuchsia_zircon_sys_0_3_3_ rec {};
   httparse_1_2_4 = httparse_1_2_4_ rec {
     features = mkFeatures httparse_1_2_4_features;
@@ -894,41 +907,41 @@ rec {
   hubcaps_0_3_16 = hubcaps_0_3_16_ rec {
     dependencies = [ error_chain_0_10_0 hyper_0_10_13 log_0_3_8 serde_1_0_27 serde_derive_1_0_27 serde_json_1_0_9 url_1_6_0 ];
   };
-  error_chain_0_10_0_features."default".from_hubcaps_0_3_16__default_ = true;
-  hyper_0_10_13_features."default".from_hubcaps_0_3_16__default_ = true;
-  log_0_3_8_features."default".from_hubcaps_0_3_16__default_ = true;
-  serde_1_0_27_features."default".from_hubcaps_0_3_16__default_ = true;
-  serde_derive_1_0_27_features."default".from_hubcaps_0_3_16__default_ = true;
-  serde_json_1_0_9_features."default".from_hubcaps_0_3_16__default_ = true;
-  url_1_6_0_features."default".from_hubcaps_0_3_16__default_ = true;
+  error_chain_0_10_0_features."default".from_hubcaps_0_3_16__default = true;
+  hyper_0_10_13_features."default".from_hubcaps_0_3_16__default = true;
+  log_0_3_8_features."default".from_hubcaps_0_3_16__default = true;
+  serde_1_0_27_features."default".from_hubcaps_0_3_16__default = true;
+  serde_derive_1_0_27_features."default".from_hubcaps_0_3_16__default = true;
+  serde_json_1_0_9_features."default".from_hubcaps_0_3_16__default = true;
+  url_1_6_0_features."default".from_hubcaps_0_3_16__default = true;
   hyper_0_10_13 = hyper_0_10_13_ rec {
     dependencies = [ base64_0_6_0 httparse_1_2_4 language_tags_0_2_2 log_0_3_8 mime_0_2_6 num_cpus_1_8_0 time_0_1_39 traitobject_0_1_0 typeable_0_1_2 unicase_1_4_2 url_1_6_0 ];
     features = mkFeatures hyper_0_10_13_features;
   };
   hyper_0_10_13_features."".self = true;
-  base64_0_6_0_features."default".from_hyper_0_10_13__default_ = true;
-  httparse_1_2_4_features."default".from_hyper_0_10_13__default_ = true;
-  language_tags_0_2_2_features."default".from_hyper_0_10_13__default_ = true;
-  log_0_3_8_features."default".from_hyper_0_10_13__default_ = true;
-  mime_0_2_6_features."default".from_hyper_0_10_13__default_ = true;
-  num_cpus_1_8_0_features."default".from_hyper_0_10_13__default_ = true;
-  time_0_1_39_features."default".from_hyper_0_10_13__default_ = true;
-  traitobject_0_1_0_features."default".from_hyper_0_10_13__default_ = true;
-  typeable_0_1_2_features."default".from_hyper_0_10_13__default_ = true;
-  unicase_1_4_2_features."default".from_hyper_0_10_13__default_ = true;
-  url_1_6_0_features."default".from_hyper_0_10_13__default_ = true;
+  base64_0_6_0_features."default".from_hyper_0_10_13__default = true;
+  httparse_1_2_4_features."default".from_hyper_0_10_13__default = true;
+  language_tags_0_2_2_features."default".from_hyper_0_10_13__default = true;
+  log_0_3_8_features."default".from_hyper_0_10_13__default = true;
+  mime_0_2_6_features."default".from_hyper_0_10_13__default = true;
+  num_cpus_1_8_0_features."default".from_hyper_0_10_13__default = true;
+  time_0_1_39_features."default".from_hyper_0_10_13__default = true;
+  traitobject_0_1_0_features."default".from_hyper_0_10_13__default = true;
+  typeable_0_1_2_features."default".from_hyper_0_10_13__default = true;
+  unicase_1_4_2_features."default".from_hyper_0_10_13__default = true;
+  url_1_6_0_features."default".from_hyper_0_10_13__default = true;
   hyper_native_tls_0_2_4 = hyper_native_tls_0_2_4_ rec {
     dependencies = [ antidote_1_0_0 hyper_0_10_13 native_tls_0_1_5 ];
   };
-  antidote_1_0_0_features."default".from_hyper_native_tls_0_2_4__default_ = true;
-  hyper_0_10_13_features."default".from_hyper_native_tls_0_2_4__default_ = true;
-  native_tls_0_1_5_features."default".from_hyper_native_tls_0_2_4__default_ = true;
+  antidote_1_0_0_features."default".from_hyper_native_tls_0_2_4__default = true;
+  hyper_0_10_13_features."default".from_hyper_native_tls_0_2_4__default = true;
+  native_tls_0_1_5_features."default".from_hyper_native_tls_0_2_4__default = true;
   idna_0_1_4 = idna_0_1_4_ rec {
     dependencies = [ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_5 ];
   };
-  matches_0_1_6_features."default".from_idna_0_1_4__default_ = true;
-  unicode_bidi_0_3_4_features."default".from_idna_0_1_4__default_ = true;
-  unicode_normalization_0_1_5_features."default".from_idna_0_1_4__default_ = true;
+  matches_0_1_6_features."default".from_idna_0_1_4__default = true;
+  unicode_bidi_0_3_4_features."default".from_idna_0_1_4__default = true;
+  unicode_normalization_0_1_5_features."default".from_idna_0_1_4__default = true;
   itoa_0_3_4 = itoa_0_3_4_ rec {
     features = mkFeatures itoa_0_3_4_features;
   };
@@ -937,16 +950,15 @@ rec {
     dependencies = [ winapi_0_2_8 ];
     buildDependencies = [ winapi_build_0_1_1 ];
   };
-  winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default_ = true;
-  winapi_build_0_1_1_features."default".from_kernel32_sys_0_2_2__default_ = true;
+  winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true;
   language_tags_0_2_2 = language_tags_0_2_2_ rec {
     dependencies = [];
     features = mkFeatures language_tags_0_2_2_features;
   };
   language_tags_0_2_2_features."heapsize".self_heap_size = hasFeature (language_tags_0_2_2_features."heap_size" or {});
   language_tags_0_2_2_features."heapsize_plugin".self_heap_size = hasFeature (language_tags_0_2_2_features."heap_size" or {});
-  heapsize_0_0_0_features."default".from_language_tags_0_2_2__default_ = true;
-  heapsize_plugin_0_0_0_features."default".from_language_tags_0_2_2__default_ = true;
+  heapsize_0_0_0_features."default".from_language_tags_0_2_2__default = true;
+  heapsize_plugin_0_0_0_features."default".from_language_tags_0_2_2__default = true;
   lazy_static_0_2_11 = lazy_static_0_2_11_ rec {
     dependencies = [];
     features = mkFeatures lazy_static_0_2_11_features;
@@ -954,8 +966,8 @@ rec {
   lazy_static_0_2_11_features."compiletest_rs".self_compiletest = hasFeature (lazy_static_0_2_11_features."compiletest" or {});
   lazy_static_0_2_11_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {});
   lazy_static_0_2_11_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {});
-  compiletest_rs_0_0_0_features."default".from_lazy_static_0_2_11__default_ = true;
-  spin_0_0_0_features."default".from_lazy_static_0_2_11__default_ = true;
+  compiletest_rs_0_0_0_features."default".from_lazy_static_0_2_11__default = true;
+  spin_0_0_0_features."default".from_lazy_static_0_2_11__default = true;
   lazy_static_1_0_0 = lazy_static_1_0_0_ rec {
     dependencies = [];
     features = mkFeatures lazy_static_1_0_0_features;
@@ -963,22 +975,41 @@ rec {
   lazy_static_1_0_0_features."compiletest_rs".self_compiletest = hasFeature (lazy_static_1_0_0_features."compiletest" or {});
   lazy_static_1_0_0_features."nightly".self_spin_no_std = hasFeature (lazy_static_1_0_0_features."spin_no_std" or {});
   lazy_static_1_0_0_features."spin".self_spin_no_std = hasFeature (lazy_static_1_0_0_features."spin_no_std" or {});
-  compiletest_rs_0_0_0_features."default".from_lazy_static_1_0_0__default_ = true;
-  spin_0_0_0_features."default".from_lazy_static_1_0_0__default_ = true;
+  compiletest_rs_0_0_0_features."default".from_lazy_static_1_0_0__default = true;
+  spin_0_0_0_features."default".from_lazy_static_1_0_0__default = true;
   libc_0_2_36 = libc_0_2_36_ rec {
     features = mkFeatures libc_0_2_36_features;
   };
   libc_0_2_36_features."use_std".self_default = hasDefault libc_0_2_36_features;
+  linked_hash_map_0_4_2 = linked_hash_map_0_4_2_ rec {
+    dependencies = [];
+    features = mkFeatures linked_hash_map_0_4_2_features;
+  };
+  linked_hash_map_0_4_2_features."heapsize".self_heapsize_impl = hasFeature (linked_hash_map_0_4_2_features."heapsize_impl" or {});
+  linked_hash_map_0_4_2_features."serde".self_serde_impl = hasFeature (linked_hash_map_0_4_2_features."serde_impl" or {});
+  linked_hash_map_0_4_2_features."serde_test".self_serde_impl = hasFeature (linked_hash_map_0_4_2_features."serde_impl" or {});
+  clippy_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true;
+  heapsize_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true;
+  serde_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true;
+  serde_test_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true;
   log_0_3_8 = log_0_3_8_ rec {
     features = mkFeatures log_0_3_8_features;
   };
   log_0_3_8_features."use_std".self_default = hasDefault log_0_3_8_features;
+  lru_cache_0_1_1 = lru_cache_0_1_1_ rec {
+    dependencies = [ linked_hash_map_0_4_2 ];
+    features = mkFeatures lru_cache_0_1_1_features;
+  };
+  lru_cache_0_1_1_features."heapsize".self_heapsize_impl = hasFeature (lru_cache_0_1_1_features."heapsize_impl" or {});
+  heapsize_0_0_0_features."default".from_lru_cache_0_1_1__default = true;
+  linked_hash_map_0_4_2_features."heapsize_impl".from_lru_cache_0_1_1__heapsize_impl = hasFeature (lru_cache_0_1_1_features."heapsize_impl" or {});
+  linked_hash_map_0_4_2_features."default".from_lru_cache_0_1_1__default = true;
   matches_0_1_6 = matches_0_1_6_ rec {};
   md5_0_3_6 = md5_0_3_6_ rec {};
   memchr_0_1_11 = memchr_0_1_11_ rec {
     dependencies = [ libc_0_2_36 ];
   };
-  libc_0_2_36_features."default".from_memchr_0_1_11__default_ = true;
+  libc_0_2_36_features."default".from_memchr_0_1_11__default = true;
   memchr_2_0_1 = memchr_2_0_1_ rec {
     dependencies = [ libc_0_2_36 ]
       ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_36] else []);
@@ -989,69 +1020,68 @@ rec {
   memchr_2_0_1_features."libc".self_default = hasDefault memchr_2_0_1_features;
   memchr_2_0_1_features."libc".self_use_std = hasFeature (memchr_2_0_1_features."use_std" or {});
   libc_0_2_36_features."use_std".from_memchr_2_0_1__use_std = hasFeature (memchr_2_0_1_features."use_std" or {});
-  libc_0_2_36_features."default".from_memchr_2_0_1__default_ = false;
+  libc_0_2_36_features."default".from_memchr_2_0_1__default = false;
   mime_0_2_6 = mime_0_2_6_ rec {
     dependencies = [ log_0_3_8 ];
     features = mkFeatures mime_0_2_6_features;
   };
   mime_0_2_6_features."heapsize".self_heap_size = hasFeature (mime_0_2_6_features."heap_size" or {});
-  heapsize_0_0_0_features."default".from_mime_0_2_6__default_ = true;
-  log_0_3_8_features."default".from_mime_0_2_6__default_ = true;
-  serde_0_0_0_features."default".from_mime_0_2_6__default_ = true;
+  heapsize_0_0_0_features."default".from_mime_0_2_6__default = true;
+  log_0_3_8_features."default".from_mime_0_2_6__default = true;
+  serde_0_0_0_features."default".from_mime_0_2_6__default = true;
   native_tls_0_1_5 = native_tls_0_1_5_ rec {
     dependencies = [ lazy_static_0_2_11 ]
       ++ (if kernel == "darwin" || kernel == "ios" then [ libc_0_2_36 security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_5 ] else [])
       ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then [ openssl_0_9_23 ] else [])
       ++ (if kernel == "windows" then [ schannel_0_1_10 ] else []);
   };
+  lazy_static_0_2_11_features."default".from_native_tls_0_1_5__default = true;
+  libc_0_2_36_features."default".from_native_tls_0_1_5__default = true;
   security_framework_0_1_16_features."OSX_10_8".from_native_tls_0_1_5 = true;
-  lazy_static_0_2_11_features."default".from_native_tls_0_1_5__default_ = true;
-  libc_0_2_36_features."default".from_native_tls_0_1_5__default_ = true;
-  openssl_0_9_23_features."default".from_native_tls_0_1_5__default_ = true;
-  schannel_0_1_10_features."default".from_native_tls_0_1_5__default_ = true;
-  security_framework_0_1_16_features."default".from_native_tls_0_1_5__default_ = true;
-  security_framework_sys_0_1_16_features."default".from_native_tls_0_1_5__default_ = true;
-  tempdir_0_3_5_features."default".from_native_tls_0_1_5__default_ = true;
+  security_framework_0_1_16_features."default".from_native_tls_0_1_5__default = true;
+  security_framework_sys_0_1_16_features."default".from_native_tls_0_1_5__default = true;
+  tempdir_0_3_5_features."default".from_native_tls_0_1_5__default = true;
+  openssl_0_9_23_features."default".from_native_tls_0_1_5__default = true;
+  schannel_0_1_10_features."default".from_native_tls_0_1_5__default = true;
   num_traits_0_1_41 = num_traits_0_1_41_ rec {};
   num_cpus_1_8_0 = num_cpus_1_8_0_ rec {
     dependencies = [ libc_0_2_36 ];
   };
-  libc_0_2_36_features."default".from_num_cpus_1_8_0__default_ = true;
+  libc_0_2_36_features."default".from_num_cpus_1_8_0__default = true;
   ofborg_0_1_0 = ofborg_0_1_0_ rec {
-    dependencies = [ amqp_0_1_0 env_logger_0_4_3 fs2_0_4_3 hubcaps_0_3_16 hyper_0_10_13 hyper_native_tls_0_2_4 log_0_3_8 md5_0_3_6 serde_1_0_27 serde_derive_1_0_27 serde_json_1_0_9 tempfile_2_2_0 uuid_0_4_0 ];
+    dependencies = [ amqp_0_1_0 env_logger_0_4_3 fs2_0_4_3 hubcaps_0_3_16 hyper_0_10_13 hyper_native_tls_0_2_4 log_0_3_8 lru_cache_0_1_1 md5_0_3_6 serde_1_0_27 serde_derive_1_0_27 serde_json_1_0_9 tempfile_2_2_0 uuid_0_4_0 ];
   };
+  amqp_0_1_0_features."default".from_ofborg_0_1_0__default = true;
+  env_logger_0_4_3_features."default".from_ofborg_0_1_0__default = true;
+  fs2_0_4_3_features."default".from_ofborg_0_1_0__default = true;
+  hubcaps_0_3_16_features."default".from_ofborg_0_1_0__default = true;
+  hyper_0_10_13_features."default".from_ofborg_0_1_0__default = true;
+  hyper_native_tls_0_2_4_features."default".from_ofborg_0_1_0__default = true;
+  log_0_3_8_features."default".from_ofborg_0_1_0__default = true;
+  lru_cache_0_1_1_features."default".from_ofborg_0_1_0__default = true;
+  md5_0_3_6_features."default".from_ofborg_0_1_0__default = true;
+  serde_1_0_27_features."default".from_ofborg_0_1_0__default = true;
+  serde_derive_1_0_27_features."default".from_ofborg_0_1_0__default = true;
+  serde_json_1_0_9_features."default".from_ofborg_0_1_0__default = true;
+  tempfile_2_2_0_features."default".from_ofborg_0_1_0__default = true;
   uuid_0_4_0_features."v4".from_ofborg_0_1_0 = true;
-  amqp_0_1_0_features."default".from_ofborg_0_1_0__default_ = true;
-  env_logger_0_4_3_features."default".from_ofborg_0_1_0__default_ = true;
-  fs2_0_4_3_features."default".from_ofborg_0_1_0__default_ = true;
-  hubcaps_0_3_16_features."default".from_ofborg_0_1_0__default_ = true;
-  hyper_0_10_13_features."default".from_ofborg_0_1_0__default_ = true;
-  hyper_native_tls_0_2_4_features."default".from_ofborg_0_1_0__default_ = true;
-  log_0_3_8_features."default".from_ofborg_0_1_0__default_ = true;
-  md5_0_3_6_features."default".from_ofborg_0_1_0__default_ = true;
-  serde_1_0_27_features."default".from_ofborg_0_1_0__default_ = true;
-  serde_derive_1_0_27_features."default".from_ofborg_0_1_0__default_ = true;
-  serde_json_1_0_9_features."default".from_ofborg_0_1_0__default_ = true;
-  tempfile_2_2_0_features."default".from_ofborg_0_1_0__default_ = true;
-  uuid_0_4_0_features."default".from_ofborg_0_1_0__default_ = true;
+  uuid_0_4_0_features."default".from_ofborg_0_1_0__default = true;
   openssl_0_9_23 = openssl_0_9_23_ rec {
     dependencies = [ bitflags_0_9_1 foreign_types_0_3_2 lazy_static_1_0_0 libc_0_2_36 openssl_sys_0_9_24 ];
     features = mkFeatures openssl_0_9_23_features;
   };
   openssl_0_9_23_features."".self = true;
-  bitflags_0_9_1_features."default".from_openssl_0_9_23__default_ = true;
-  foreign_types_0_3_2_features."default".from_openssl_0_9_23__default_ = true;
-  lazy_static_1_0_0_features."default".from_openssl_0_9_23__default_ = true;
-  libc_0_2_36_features."default".from_openssl_0_9_23__default_ = true;
-  openssl_sys_0_9_24_features."default".from_openssl_0_9_23__default_ = true;
+  bitflags_0_9_1_features."default".from_openssl_0_9_23__default = true;
+  foreign_types_0_3_2_features."default".from_openssl_0_9_23__default = true;
+  lazy_static_1_0_0_features."default".from_openssl_0_9_23__default = true;
+  libc_0_2_36_features."default".from_openssl_0_9_23__default = true;
+  openssl_sys_0_9_24_features."default".from_openssl_0_9_23__default = true;
   openssl_sys_0_9_24 = openssl_sys_0_9_24_ rec {
     dependencies = [ libc_0_2_36 ]
       ++ (if abi == "msvc" then [] else []);
     buildDependencies = [ cc_1_0_4 pkg_config_0_3_9 ];
   };
-  cc_1_0_4_features."default".from_openssl_sys_0_9_24__default_ = true;
-  libc_0_2_36_features."default".from_openssl_sys_0_9_24__default_ = true;
-  pkg_config_0_3_9_features."default".from_openssl_sys_0_9_24__default_ = true;
+  libc_0_2_36_features."default".from_openssl_sys_0_9_24__default = true;
   percent_encoding_1_0_1 = percent_encoding_1_0_1_ rec {};
   pkg_config_0_3_9 = pkg_config_0_3_9_ rec {};
   quote_0_3_15 = quote_0_3_15_ rec {};
@@ -1061,31 +1091,31 @@ rec {
     features = mkFeatures rand_0_3_20_features;
   };
   rand_0_3_20_features."i128_support".self_nightly = hasFeature (rand_0_3_20_features."nightly" or {});
-  fuchsia_zircon_0_3_3_features."default".from_rand_0_3_20__default_ = true;
-  libc_0_2_36_features."default".from_rand_0_3_20__default_ = true;
+  libc_0_2_36_features."default".from_rand_0_3_20__default = true;
+  fuchsia_zircon_0_3_3_features."default".from_rand_0_3_20__default = true;
   redox_syscall_0_1_37 = redox_syscall_0_1_37_ rec {};
   regex_0_1_80 = regex_0_1_80_ rec {
     dependencies = [ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ];
     features = mkFeatures regex_0_1_80_features;
   };
   regex_0_1_80_features."simd".self_simd-accel = hasFeature (regex_0_1_80_features."simd-accel" or {});
-  aho_corasick_0_5_3_features."default".from_regex_0_1_80__default_ = true;
-  memchr_0_1_11_features."default".from_regex_0_1_80__default_ = true;
-  regex_syntax_0_3_9_features."default".from_regex_0_1_80__default_ = true;
-  simd_0_0_0_features."default".from_regex_0_1_80__default_ = true;
-  thread_local_0_2_7_features."default".from_regex_0_1_80__default_ = true;
-  utf8_ranges_0_1_3_features."default".from_regex_0_1_80__default_ = true;
+  aho_corasick_0_5_3_features."default".from_regex_0_1_80__default = true;
+  memchr_0_1_11_features."default".from_regex_0_1_80__default = true;
+  regex_syntax_0_3_9_features."default".from_regex_0_1_80__default = true;
+  simd_0_0_0_features."default".from_regex_0_1_80__default = true;
+  thread_local_0_2_7_features."default".from_regex_0_1_80__default = true;
+  utf8_ranges_0_1_3_features."default".from_regex_0_1_80__default = true;
   regex_0_2_5 = regex_0_2_5_ rec {
     dependencies = [ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_4_2 thread_local_0_3_5 utf8_ranges_1_0_0 ];
     features = mkFeatures regex_0_2_5_features;
   };
   regex_0_2_5_features."simd".self_simd-accel = hasFeature (regex_0_2_5_features."simd-accel" or {});
-  aho_corasick_0_6_4_features."default".from_regex_0_2_5__default_ = true;
-  memchr_2_0_1_features."default".from_regex_0_2_5__default_ = true;
-  regex_syntax_0_4_2_features."default".from_regex_0_2_5__default_ = true;
-  simd_0_0_0_features."default".from_regex_0_2_5__default_ = true;
-  thread_local_0_3_5_features."default".from_regex_0_2_5__default_ = true;
-  utf8_ranges_1_0_0_features."default".from_regex_0_2_5__default_ = true;
+  aho_corasick_0_6_4_features."default".from_regex_0_2_5__default = true;
+  memchr_2_0_1_features."default".from_regex_0_2_5__default = true;
+  regex_syntax_0_4_2_features."default".from_regex_0_2_5__default = true;
+  simd_0_0_0_features."default".from_regex_0_2_5__default = true;
+  thread_local_0_3_5_features."default".from_regex_0_2_5__default = true;
+  utf8_ranges_1_0_0_features."default".from_regex_0_2_5__default = true;
   regex_syntax_0_3_9 = regex_syntax_0_3_9_ rec {};
   regex_syntax_0_4_2 = regex_syntax_0_4_2_ rec {};
   rustc_demangle_0_1_5 = rustc_demangle_0_1_5_ rec {};
@@ -1093,6 +1123,7 @@ rec {
   schannel_0_1_10 = schannel_0_1_10_ rec {
     dependencies = [ lazy_static_1_0_0 winapi_0_3_4 ];
   };
+  lazy_static_1_0_0_features."default".from_schannel_0_1_10__default = true;
   winapi_0_3_4_features."lmcons".from_schannel_0_1_10 = true;
   winapi_0_3_4_features."minschannel".from_schannel_0_1_10 = true;
   winapi_0_3_4_features."securitybaseapi".from_schannel_0_1_10 = true;
@@ -1102,8 +1133,7 @@ rec {
   winapi_0_3_4_features."winbase".from_schannel_0_1_10 = true;
   winapi_0_3_4_features."wincrypt".from_schannel_0_1_10 = true;
   winapi_0_3_4_features."winerror".from_schannel_0_1_10 = true;
-  lazy_static_1_0_0_features."default".from_schannel_0_1_10__default_ = true;
-  winapi_0_3_4_features."default".from_schannel_0_1_10__default_ = true;
+  winapi_0_3_4_features."default".from_schannel_0_1_10__default = true;
   security_framework_0_1_16 = security_framework_0_1_16_ rec {
     dependencies = [ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_36 security_framework_sys_0_1_16 ];
     features = mkFeatures security_framework_0_1_16_features;
@@ -1112,15 +1142,15 @@ rec {
   security_framework_0_1_16_features."OSX_10_10".self_OSX_10_11 = hasFeature (security_framework_0_1_16_features."OSX_10_11" or {});
   security_framework_0_1_16_features."OSX_10_11".self_OSX_10_12 = hasFeature (security_framework_0_1_16_features."OSX_10_12" or {});
   security_framework_0_1_16_features."OSX_10_8".self_OSX_10_9 = hasFeature (security_framework_0_1_16_features."OSX_10_9" or {});
+  core_foundation_0_2_3_features."default".from_security_framework_0_1_16__default = true;
+  core_foundation_sys_0_2_3_features."default".from_security_framework_0_1_16__default = true;
+  libc_0_2_36_features."default".from_security_framework_0_1_16__default = true;
   security_framework_sys_0_1_16_features."OSX_10_10".from_security_framework_0_1_16__OSX_10_10 = hasFeature (security_framework_0_1_16_features."OSX_10_10" or {});
   security_framework_sys_0_1_16_features."OSX_10_11".from_security_framework_0_1_16__OSX_10_11 = hasFeature (security_framework_0_1_16_features."OSX_10_11" or {});
   security_framework_sys_0_1_16_features."OSX_10_11".from_security_framework_0_1_16__OSX_10_12 = hasFeature (security_framework_0_1_16_features."OSX_10_12" or {});
   security_framework_sys_0_1_16_features."OSX_10_8".from_security_framework_0_1_16__OSX_10_8 = hasFeature (security_framework_0_1_16_features."OSX_10_8" or {});
   security_framework_sys_0_1_16_features."OSX_10_9".from_security_framework_0_1_16__OSX_10_9 = hasFeature (security_framework_0_1_16_features."OSX_10_9" or {});
-  core_foundation_0_2_3_features."default".from_security_framework_0_1_16__default_ = true;
-  core_foundation_sys_0_2_3_features."default".from_security_framework_0_1_16__default_ = true;
-  libc_0_2_36_features."default".from_security_framework_0_1_16__default_ = true;
-  security_framework_sys_0_1_16_features."default".from_security_framework_0_1_16__default_ = true;
+  security_framework_sys_0_1_16_features."default".from_security_framework_0_1_16__default = true;
   security_framework_sys_0_1_16 = security_framework_sys_0_1_16_ rec {
     dependencies = [ core_foundation_sys_0_2_3 libc_0_2_36 ];
     features = mkFeatures security_framework_sys_0_1_16_features;
@@ -1129,8 +1159,8 @@ rec {
   security_framework_sys_0_1_16_features."OSX_10_10".self_OSX_10_11 = hasFeature (security_framework_sys_0_1_16_features."OSX_10_11" or {});
   security_framework_sys_0_1_16_features."OSX_10_11".self_OSX_10_12 = hasFeature (security_framework_sys_0_1_16_features."OSX_10_12" or {});
   security_framework_sys_0_1_16_features."OSX_10_8".self_OSX_10_9 = hasFeature (security_framework_sys_0_1_16_features."OSX_10_9" or {});
-  core_foundation_sys_0_2_3_features."default".from_security_framework_sys_0_1_16__default_ = true;
-  libc_0_2_36_features."default".from_security_framework_sys_0_1_16__default_ = true;
+  core_foundation_sys_0_2_3_features."default".from_security_framework_sys_0_1_16__default = true;
+  libc_0_2_36_features."default".from_security_framework_sys_0_1_16__default = true;
   serde_1_0_27 = serde_1_0_27_ rec {
     dependencies = [];
     features = mkFeatures serde_1_0_27_features;
@@ -1139,37 +1169,35 @@ rec {
   serde_1_0_27_features."std".self_default = hasDefault serde_1_0_27_features;
   serde_1_0_27_features."serde_derive".self_derive = hasFeature (serde_1_0_27_features."derive" or {});
   serde_1_0_27_features."serde_derive".self_playground = hasFeature (serde_1_0_27_features."playground" or {});
-  serde_derive_0_0_0_features."default".from_serde_1_0_27__default_ = true;
+  serde_derive_0_0_0_features."default".from_serde_1_0_27__default = true;
   serde_derive_1_0_27 = serde_derive_1_0_27_ rec {
     dependencies = [ quote_0_3_15 serde_derive_internals_0_19_0 syn_0_11_11 ];
     features = mkFeatures serde_derive_1_0_27_features;
   };
   serde_derive_1_0_27_features."".self = true;
+  quote_0_3_15_features."default".from_serde_derive_1_0_27__default = true;
+  serde_derive_internals_0_19_0_features."default".from_serde_derive_1_0_27__default = false;
   syn_0_11_11_features."visit".from_serde_derive_1_0_27 = true;
-  quote_0_3_15_features."default".from_serde_derive_1_0_27__default_ = true;
-  serde_derive_internals_0_19_0_features."default".from_serde_derive_1_0_27__default_ = false;
-  syn_0_11_11_features."default".from_serde_derive_1_0_27__default_ = true;
+  syn_0_11_11_features."default".from_serde_derive_1_0_27__default = true;
   serde_derive_internals_0_19_0 = serde_derive_internals_0_19_0_ rec {
     dependencies = [ syn_0_11_11 synom_0_11_3 ];
   };
   syn_0_11_11_features."parsing".from_serde_derive_internals_0_19_0 = true;
-  syn_0_11_11_features."default".from_serde_derive_internals_0_19_0__default_ = false;
-  synom_0_11_3_features."default".from_serde_derive_internals_0_19_0__default_ = true;
+  syn_0_11_11_features."default".from_serde_derive_internals_0_19_0__default = false;
+  synom_0_11_3_features."default".from_serde_derive_internals_0_19_0__default = true;
   serde_json_1_0_9 = serde_json_1_0_9_ rec {
     dependencies = [ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_41 serde_1_0_27 ];
     features = mkFeatures serde_json_1_0_9_features;
   };
   serde_json_1_0_9_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_1_0_9_features."preserve_order" or {});
-  dtoa_0_4_2_features."default".from_serde_json_1_0_9__default_ = true;
-  itoa_0_3_4_features."default".from_serde_json_1_0_9__default_ = true;
-  linked_hash_map_0_0_0_features."default".from_serde_json_1_0_9__default_ = true;
-  num_traits_0_1_41_features."default".from_serde_json_1_0_9__default_ = true;
-  serde_1_0_27_features."default".from_serde_json_1_0_9__default_ = true;
+  dtoa_0_4_2_features."default".from_serde_json_1_0_9__default = true;
+  itoa_0_3_4_features."default".from_serde_json_1_0_9__default = true;
+  linked_hash_map_0_0_0_features."default".from_serde_json_1_0_9__default = true;
+  num_traits_0_1_41_features."default".from_serde_json_1_0_9__default = true;
+  serde_1_0_27_features."default".from_serde_json_1_0_9__default = true;
   syn_0_11_11 = syn_0_11_11_ rec {
     dependencies = [ quote_0_3_15 synom_0_11_3 unicode_xid_0_0_4 ]
-      ++ (if lib.lists.any (x: x == "quote") features then [quote_0_3_15] else [])
-      ++ (if lib.lists.any (x: x == "synom") features then [synom_0_11_3] else [])
-      ++ (if lib.lists.any (x: x == "unicode-xid") features then [unicode_xid_0_0_4] else []);
+      ++ (if lib.lists.any (x: x == "quote") features then [quote_0_3_15] else [])      ++ (if lib.lists.any (x: x == "synom") features then [synom_0_11_3] else [])      ++ (if lib.lists.any (x: x == "unicode-xid") features then [unicode_xid_0_0_4] else []);
     features = mkFeatures syn_0_11_11_features;
   };
   syn_0_11_11_features."".self = true;
@@ -1178,47 +1206,50 @@ rec {
   syn_0_11_11_features."unicode-xid".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {});
   syn_0_11_11_features."synom".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {});
   syn_0_11_11_features."quote".self_printing = hasFeature (syn_0_11_11_features."printing" or {});
-  quote_0_3_15_features."default".from_syn_0_11_11__default_ = true;
-  synom_0_11_3_features."default".from_syn_0_11_11__default_ = true;
-  unicode_xid_0_0_4_features."default".from_syn_0_11_11__default_ = true;
+  quote_0_3_15_features."default".from_syn_0_11_11__default = true;
+  synom_0_11_3_features."default".from_syn_0_11_11__default = true;
+  unicode_xid_0_0_4_features."default".from_syn_0_11_11__default = true;
   synom_0_11_3 = synom_0_11_3_ rec {
     dependencies = [ unicode_xid_0_0_4 ];
   };
-  unicode_xid_0_0_4_features."default".from_synom_0_11_3__default_ = true;
+  unicode_xid_0_0_4_features."default".from_synom_0_11_3__default = true;
   tempdir_0_3_5 = tempdir_0_3_5_ rec {
     dependencies = [ rand_0_3_20 ];
   };
-  rand_0_3_20_features."default".from_tempdir_0_3_5__default_ = true;
+  rand_0_3_20_features."default".from_tempdir_0_3_5__default = true;
   tempfile_2_2_0 = tempfile_2_2_0_ rec {
     dependencies = [ rand_0_3_20 ]
       ++ (if kernel == "redox" then [ redox_syscall_0_1_37 ] else [])
       ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_36 ] else [])
       ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []);
   };
-  kernel32_sys_0_2_2_features."default".from_tempfile_2_2_0__default_ = true;
-  libc_0_2_36_features."default".from_tempfile_2_2_0__default_ = true;
-  rand_0_3_20_features."default".from_tempfile_2_2_0__default_ = true;
-  redox_syscall_0_1_37_features."default".from_tempfile_2_2_0__default_ = true;
-  winapi_0_2_8_features."default".from_tempfile_2_2_0__default_ = true;
+  rand_0_3_20_features."default".from_tempfile_2_2_0__default = true;
+  redox_syscall_0_1_37_features."default".from_tempfile_2_2_0__default = true;
+  libc_0_2_36_features."default".from_tempfile_2_2_0__default = true;
+  kernel32_sys_0_2_2_features."default".from_tempfile_2_2_0__default = true;
+  winapi_0_2_8_features."default".from_tempfile_2_2_0__default = true;
   thread_id_2_0_0 = thread_id_2_0_0_ rec {
     dependencies = [ kernel32_sys_0_2_2 libc_0_2_36 ];
   };
-  kernel32_sys_0_2_2_features."default".from_thread_id_2_0_0__default_ = true;
-  libc_0_2_36_features."default".from_thread_id_2_0_0__default_ = true;
+  kernel32_sys_0_2_2_features."default".from_thread_id_2_0_0__default = true;
+  libc_0_2_36_features."default".from_thread_id_2_0_0__default = true;
   thread_local_0_2_7 = thread_local_0_2_7_ rec {
     dependencies = [ thread_id_2_0_0 ];
   };
-  thread_id_2_0_0_features."default".from_thread_local_0_2_7__default_ = true;
+  thread_id_2_0_0_features."default".from_thread_local_0_2_7__default = true;
   thread_local_0_3_5 = thread_local_0_3_5_ rec {
     dependencies = [ lazy_static_1_0_0 unreachable_1_0_0 ];
   };
-  lazy_static_1_0_0_features."default".from_thread_local_0_3_5__default_ = true;
-  unreachable_1_0_0_features."default".from_thread_local_0_3_5__default_ = true;
+  lazy_static_1_0_0_features."default".from_thread_local_0_3_5__default = true;
+  unreachable_1_0_0_features."default".from_thread_local_0_3_5__default = true;
   time_0_1_39 = time_0_1_39_ rec {
     dependencies = [ libc_0_2_36 ]
       ++ (if kernel == "redox" then [ redox_syscall_0_1_37 ] else [])
       ++ (if kernel == "windows" then [ winapi_0_3_4 ] else []);
   };
+  libc_0_2_36_features."default".from_time_0_1_39__default = true;
+  rustc_serialize_0_0_0_features."default".from_time_0_1_39__default = true;
+  redox_syscall_0_1_37_features."default".from_time_0_1_39__default = true;
   winapi_0_3_4_features."std".from_time_0_1_39 = true;
   winapi_0_3_4_features."minwinbase".from_time_0_1_39 = true;
   winapi_0_3_4_features."minwindef".from_time_0_1_39 = true;
@@ -1226,10 +1257,7 @@ rec {
   winapi_0_3_4_features."profileapi".from_time_0_1_39 = true;
   winapi_0_3_4_features."sysinfoapi".from_time_0_1_39 = true;
   winapi_0_3_4_features."timezoneapi".from_time_0_1_39 = true;
-  libc_0_2_36_features."default".from_time_0_1_39__default_ = true;
-  redox_syscall_0_1_37_features."default".from_time_0_1_39__default_ = true;
-  rustc_serialize_0_0_0_features."default".from_time_0_1_39__default_ = true;
-  winapi_0_3_4_features."default".from_time_0_1_39__default_ = true;
+  winapi_0_3_4_features."default".from_time_0_1_39__default = true;
   traitobject_0_1_0 = traitobject_0_1_0_ rec {};
   typeable_0_1_2 = typeable_0_1_2_ rec {};
   unicase_1_4_2 = unicase_1_4_2_ rec {
@@ -1239,9 +1267,8 @@ rec {
   };
   unicase_1_4_2_features."heapsize".self_heap_size = hasFeature (unicase_1_4_2_features."heap_size" or {});
   unicase_1_4_2_features."heapsize_plugin".self_heap_size = hasFeature (unicase_1_4_2_features."heap_size" or {});
-  heapsize_0_0_0_features."default".from_unicase_1_4_2__default_ = true;
-  heapsize_plugin_0_0_0_features."default".from_unicase_1_4_2__default_ = true;
-  version_check_0_1_3_features."default".from_unicase_1_4_2__default_ = true;
+  heapsize_0_0_0_features."default".from_unicase_1_4_2__default = true;
+  heapsize_plugin_0_0_0_features."default".from_unicase_1_4_2__default = true;
   unicode_bidi_0_3_4 = unicode_bidi_0_3_4_ rec {
     dependencies = [ matches_0_1_6 ];
     features = mkFeatures unicode_bidi_0_3_4_features;
@@ -1249,11 +1276,11 @@ rec {
   unicode_bidi_0_3_4_features."flame".self_flame_it = hasFeature (unicode_bidi_0_3_4_features."flame_it" or {});
   unicode_bidi_0_3_4_features."flamer".self_flame_it = hasFeature (unicode_bidi_0_3_4_features."flame_it" or {});
   unicode_bidi_0_3_4_features."serde".self_with_serde = hasFeature (unicode_bidi_0_3_4_features."with_serde" or {});
+  flame_0_0_0_features."default".from_unicode_bidi_0_3_4__default = true;
+  flamer_0_0_0_features."default".from_unicode_bidi_0_3_4__default = true;
+  matches_0_1_6_features."default".from_unicode_bidi_0_3_4__default = true;
   serde_0_0_0_features."derive".from_unicode_bidi_0_3_4 = true;
-  flame_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true;
-  flamer_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true;
-  matches_0_1_6_features."default".from_unicode_bidi_0_3_4__default_ = true;
-  serde_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true;
+  serde_0_0_0_features."default".from_unicode_bidi_0_3_4__default = true;
   unicode_normalization_0_1_5 = unicode_normalization_0_1_5_ rec {};
   unicode_xid_0_0_4 = unicode_xid_0_0_4_ rec {
     features = mkFeatures unicode_xid_0_0_4_features;
@@ -1262,20 +1289,20 @@ rec {
   unreachable_1_0_0 = unreachable_1_0_0_ rec {
     dependencies = [ void_1_0_2 ];
   };
-  void_1_0_2_features."default".from_unreachable_1_0_0__default_ = false;
+  void_1_0_2_features."default".from_unreachable_1_0_0__default = false;
   url_1_6_0 = url_1_6_0_ rec {
     dependencies = [ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_1 ];
     features = mkFeatures url_1_6_0_features;
   };
   url_1_6_0_features."heapsize".self_heap_size = hasFeature (url_1_6_0_features."heap_size" or {});
   url_1_6_0_features."encoding".self_query_encoding = hasFeature (url_1_6_0_features."query_encoding" or {});
-  encoding_0_0_0_features."default".from_url_1_6_0__default_ = true;
-  heapsize_0_0_0_features."default".from_url_1_6_0__default_ = true;
-  idna_0_1_4_features."default".from_url_1_6_0__default_ = true;
-  matches_0_1_6_features."default".from_url_1_6_0__default_ = true;
-  percent_encoding_1_0_1_features."default".from_url_1_6_0__default_ = true;
-  rustc_serialize_0_0_0_features."default".from_url_1_6_0__default_ = true;
-  serde_0_0_0_features."default".from_url_1_6_0__default_ = true;
+  encoding_0_0_0_features."default".from_url_1_6_0__default = true;
+  heapsize_0_0_0_features."default".from_url_1_6_0__default = true;
+  idna_0_1_4_features."default".from_url_1_6_0__default = true;
+  matches_0_1_6_features."default".from_url_1_6_0__default = true;
+  percent_encoding_1_0_1_features."default".from_url_1_6_0__default = true;
+  rustc_serialize_0_0_0_features."default".from_url_1_6_0__default = true;
+  serde_0_0_0_features."default".from_url_1_6_0__default = true;
   utf8_ranges_0_1_3 = utf8_ranges_0_1_3_ rec {};
   utf8_ranges_1_0_0 = utf8_ranges_1_0_0_ rec {};
   uuid_0_4_0 = uuid_0_4_0_ rec {
@@ -1286,10 +1313,10 @@ rec {
   uuid_0_4_0_features."".self = true;
   uuid_0_4_0_features."rand".self_v4 = hasFeature (uuid_0_4_0_features."v4" or {});
   uuid_0_4_0_features."sha1".self_v5 = hasFeature (uuid_0_4_0_features."v5" or {});
-  rand_0_3_20_features."default".from_uuid_0_4_0__default_ = true;
-  rustc_serialize_0_0_0_features."default".from_uuid_0_4_0__default_ = true;
-  serde_0_0_0_features."default".from_uuid_0_4_0__default_ = true;
-  sha1_0_0_0_features."default".from_uuid_0_4_0__default_ = true;
+  rand_0_3_20_features."default".from_uuid_0_4_0__default = true;
+  rustc_serialize_0_0_0_features."default".from_uuid_0_4_0__default = true;
+  serde_0_0_0_features."default".from_uuid_0_4_0__default = true;
+  sha1_0_0_0_features."default".from_uuid_0_4_0__default = true;
   vcpkg_0_2_2 = vcpkg_0_2_2_ rec {};
   version_check_0_1_3 = version_check_0_1_3_ rec {};
   void_1_0_2 = void_1_0_2_ rec {
@@ -1303,8 +1330,8 @@ rec {
     features = mkFeatures winapi_0_3_4_features;
   };
   winapi_0_3_4_features."".self = true;
-  winapi_i686_pc_windows_gnu_0_4_0_features."default".from_winapi_0_3_4__default_ = true;
-  winapi_x86_64_pc_windows_gnu_0_4_0_features."default".from_winapi_0_3_4__default_ = true;
+  winapi_i686_pc_windows_gnu_0_4_0_features."default".from_winapi_0_3_4__default = true;
+  winapi_x86_64_pc_windows_gnu_0_4_0_features."default".from_winapi_0_3_4__default = true;
   winapi_build_0_1_1 = winapi_build_0_1_1_ rec {};
   winapi_i686_pc_windows_gnu_0_4_0 = winapi_i686_pc_windows_gnu_0_4_0_ rec {};
   winapi_x86_64_pc_windows_gnu_0_4_0 = winapi_x86_64_pc_windows_gnu_0_4_0_ rec {};
diff --git a/ofborg/.gitignore b/ofborg/.gitignore
index 043c012..8151e6e 100644
--- a/ofborg/.gitignore
+++ b/ofborg/.gitignore
@@ -1,3 +1,6 @@
 target
 rust-amqp
 test-scratch
+scratch-*
+*.bk
+test-message-log-scratch/
diff --git a/ofborg/Cargo.lock b/ofborg/Cargo.lock
index df7def3..4992582 100644
--- a/ofborg/Cargo.lock
+++ b/ofborg/Cargo.lock
@@ -293,11 +293,24 @@ name = "libc"
 version = "0.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "linked-hash-map"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "log"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "lru-cache"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.6"
@@ -370,6 +383,7 @@ dependencies = [
  "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "md5 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -767,7 +781,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
 "checksum libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121"
+"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
+"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
 "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
 "checksum md5 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b6d9aab58e540f50b59d5cfa7f0da4c3d437476890e1e0b6206e230dce55a23c"
 "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
diff --git a/ofborg/Cargo.toml b/ofborg/Cargo.toml
index 4e96597..e06beb7 100644
--- a/ofborg/Cargo.toml
+++ b/ofborg/Cargo.toml
@@ -18,3 +18,4 @@ tempfile = "2.2.0"
 hubcaps = { git = "https://github.com/grahamc/hubcaps.git" }
 hyper = "0.10.*"
 hyper-native-tls = "0.2.4"
+lru-cache = "0.1.1"
diff --git a/ofborg/src/bin/log-message-collector.rs b/ofborg/src/bin/log-message-collector.rs
new file mode 100644
index 0000000..4d5e541
--- /dev/null
+++ b/ofborg/src/bin/log-message-collector.rs
@@ -0,0 +1,87 @@
+extern crate ofborg;
+extern crate amqp;
+extern crate env_logger;
+
+use std::env;
+use std::time::Duration;
+use std::thread;
+use std::path::PathBuf;
+
+use amqp::Session;
+use amqp::Table;
+
+use ofborg::message::{Pr, Repo};
+
+use ofborg::config;
+use ofborg::worker;
+use ofborg::tasks;
+use amqp::Basic;
+
+fn main() {
+    let cfg = config::load(env::args().nth(1).unwrap().as_ref());
+    ofborg::setup_log();
+
+
+    let mut session = Session::open_url(&cfg.rabbitmq.as_uri()).unwrap();
+    println!("Connected to rabbitmq");
+    {
+        println!("About to open channel #1");
+        let hbchan = session.open_channel(1).unwrap();
+
+        println!("Opened channel #1");
+
+        tasks::heartbeat::start_on_channel(hbchan, cfg.whoami());
+    }
+
+    let mut channel = session.open_channel(2).unwrap();
+
+    let queue_name = channel
+        .queue_declare(
+            "",
+            false, // passive
+            false, // durable
+            true, // exclusive
+            true, // auto_delete
+            false, //nowait
+            Table::new(),
+        )
+        .expect("Failed to declare an anon queue for log collection!")
+        .queue;
+
+    channel
+        .queue_bind(
+            queue_name.as_ref(),
+            "logs",
+            "*.*".as_ref(),
+            false,
+            Table::new(),
+        )
+        .unwrap();
+
+
+    channel
+        .basic_consume(
+            worker::new(tasks::log_message_collector::LogMessageCollector::new(
+                PathBuf::from(cfg.log_storage.clone().unwrap().path),
+                100,
+            )),
+            queue_name,
+            format!("{}-log-collector", cfg.whoami()),
+            false,
+            false,
+            false,
+            false,
+            Table::new(),
+        )
+        .unwrap();
+
+    channel.start_consuming();
+
+    println!("Finished consuming?");
+
+    channel.close(200, "Bye").unwrap();
+    println!("Closed the channel");
+    session.close(200, "Good Bye");
+    println!("Closed the session... EOF");
+
+}
diff --git a/ofborg/src/config.rs b/ofborg/src/config.rs
index 395db64..2a382b9 100644
--- a/ofborg/src/config.rs
+++ b/ofborg/src/config.rs
@@ -19,6 +19,7 @@ pub struct Config {
     pub nix: NixConfig,
     pub rabbitmq: RabbitMQConfig,
     pub github: Option<GithubConfig>,
+    pub log_storage: Option<LogStorage>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -41,12 +42,16 @@ pub struct NixConfig {
     pub build_timeout_seconds: u16,
 }
 
-
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct GithubConfig {
     pub token: String,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct LogStorage {
+    pub path: String,
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct RunnerConfig {
     pub identity: String,
diff --git a/ofborg/src/lib.rs b/ofborg/src/lib.rs
index 6f81e7f..fb70463 100644
--- a/ofborg/src/lib.rs
+++ b/ofborg/src/lib.rs
@@ -10,6 +10,7 @@ extern crate hubcaps;
 extern crate hyper;
 extern crate hyper_native_tls;
 
+extern crate lru_cache;
 extern crate tempfile;
 extern crate amqp;
 extern crate fs2;
@@ -37,6 +38,7 @@ pub mod outpathdiff;
 pub mod tagger;
 pub mod asynccmd;
 pub mod notifyworker;
+pub mod writetoline;
 
 pub mod ofborg {
     pub use asynccmd;
@@ -57,6 +59,7 @@ pub mod ofborg {
     pub use commentparser;
     pub use outpathdiff;
     pub use tagger;
+    pub use writetoline;
 
 
 }
diff --git a/ofborg/src/tasks/build.rs b/ofborg/src/tasks/build.rs
index eaa0493..e3f04b6 100644
--- a/ofborg/src/tasks/build.rs
+++ b/ofborg/src/tasks/build.rs
@@ -129,8 +129,6 @@ impl<'a, 'b> JobActions<'a, 'b> {
     }
 
     pub fn log_started(&mut self) {
-        self.line_counter += 1;
-
         let msg = buildlogmsg::BuildLogStart {
             identity: self.identity.clone(),
             system: self.system.clone(),
diff --git a/ofborg/src/tasks/log_message_collector.rs b/ofborg/src/tasks/log_message_collector.rs
new file mode 100644
index 0000000..15f0549
--- /dev/null
+++ b/ofborg/src/tasks/log_message_collector.rs
@@ -0,0 +1,321 @@
+extern crate amqp;
+extern crate env_logger;
+
+use lru_cache::LruCache;
+use serde_json;
+use std::fs;
+use std::fs::{OpenOptions, File};
+use std::path::{Component, PathBuf};
+use std::cmp::{Eq, PartialEq};
+use std::hash::Hash;
+use std::io::Read;
+
+use ofborg::writetoline;
+use ofborg::message::buildlogmsg::BuildLogMsg;
+use ofborg::worker;
+use amqp::protocol::basic::{Deliver, BasicProperties};
+
+#[derive(Eq, PartialEq, Hash, Debug, Clone)]
+pub struct LogFrom {
+    routing_key: String,
+    attempt_id: String,
+}
+
+pub struct LogMessageCollector {
+    handles: LruCache<LogFrom, File>,
+    log_root: PathBuf,
+}
+
+#[derive(Debug)]
+pub struct LogMessage {
+    from: LogFrom,
+    message: BuildLogMsg,
+}
+
+fn validate_path_segment(segment: &PathBuf) -> Result<(), String> {
+    let components = segment.components();
+
+    if components.count() == 0 {
+        return Err(String::from("Segment has no components"));
+    }
+
+    if segment.components().all(|component| match component {
+        Component::Normal(_) => true,
+        e => {
+            println!("Invalid path component: {:?}", e);
+            false
+        }
+    })
+    {
+        return Ok(());
+    } else {
+        return Err(String::from("Path contained invalid components"));
+    }
+}
+
+impl LogMessageCollector {
+    pub fn new(log_root: PathBuf, max_open: usize) -> LogMessageCollector {
+        return LogMessageCollector {
+            handles: LruCache::new(max_open),
+            log_root: log_root,
+        };
+    }
+
+    pub fn handle_for(&mut self, from: &LogFrom) -> Result<&mut File, String> {
+        if self.handles.contains_key(&from) {
+            return Ok(self.handles.get_mut(&from).expect(
+                "handles just contained the key",
+            ));
+        } else {
+            let logpath = self.path_for(&from)?;
+            let handle = self.open_log(logpath)?;
+            self.handles.insert(from.clone(), handle);
+            if let Some(handle) = self.handles.get_mut(&from) {
+                return Ok(handle);
+            } else {
+                return Err(String::from(
+                    "A just-inserted value should already be there",
+                ));
+            }
+        }
+    }
+
+    fn path_for(&self, from: &LogFrom) -> Result<PathBuf, String> {
+        let mut location = self.log_root.clone();
+
+        let routing_key = PathBuf::from(from.routing_key.clone());
+        validate_path_segment(&routing_key)?;
+        location.push(routing_key);
+
+        let attempt_id = PathBuf::from(from.attempt_id.clone());
+        validate_path_segment(&attempt_id)?;
+        location.push(attempt_id);
+
+        if location.starts_with(&self.log_root) {
+            return Ok(location);
+        } else {
+            return Err(format!(
+                "Calculating the log location for {:?} resulted in an invalid path {:?}",
+                from,
+                location
+            ));
+        }
+    }
+
+    fn open_log(&self, path: PathBuf) -> Result<File, String> {
+        let dir = path.parent().unwrap();
+        fs::create_dir_all(dir);
+
+        let attempt = OpenOptions::new()
+            .append(true)
+            .read(true)
+            .write(true)
+            .create(true)
+            .open(&path);
+
+        match attempt {
+            Ok(handle) => Ok(handle),
+            Err(e) => Err(format!(
+                "Failed to open the log file for {:?}, err: {:?}",
+                &path,
+                e
+            )),
+        }
+    }
+}
+
+impl worker::SimpleWorker for LogMessageCollector {
+    type J = LogMessage;
+
+    fn msg_to_job(
+        &mut self,
+        deliver: &Deliver,
+        _: &BasicProperties,
+        body: &Vec<u8>,
+    ) -> Result<Self::J, String> {
+
+        let decode = serde_json::from_slice(body);
+        if let Err(e) = decode {
+            return Err(format!("failed to decode job: {:?}", e));
+        }
+
+        let message: BuildLogMsg = decode.unwrap();
+
+        Ok(LogMessage {
+            from: LogFrom {
+                routing_key: deliver.routing_key.clone(),
+                attempt_id: message.attempt_id.clone(),
+            },
+            message: message,
+        })
+    }
+
+    fn consumer(&mut self, job: &LogMessage) -> worker::Actions {
+        let mut handle = self.handle_for(&job.from).unwrap();
+
+        writetoline::write_to_line(
+            &mut handle,
+            (job.message.line_number - 1) as usize,
+            &job.message.output,
+        );
+
+        return vec![worker::Action::Ack];
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::process::Command;
+    use std::path::Path;
+    use ofborg::worker::SimpleWorker;
+
+    fn tpath(component: &str) -> PathBuf {
+        return Path::new(env!("CARGO_MANIFEST_DIR")).join(component);
+    }
+
+    fn scratch_dir(name: &str) -> PathBuf {
+        tpath(&format!("./test-message-log-scratch-{}", name))
+    }
+
+    fn cleanup_scratch(name: &str) {
+        Command::new("rm")
+            .arg("-rf")
+            .arg(&scratch_dir(name))
+            .status()
+            .expect("cleanup of scratch_dir should work");
+    }
+
+    fn make_worker(name: &str) -> LogMessageCollector {
+        cleanup_scratch(name);
+
+        LogMessageCollector::new(scratch_dir(name), 3)
+    }
+
+    fn make_from(id: &str) -> LogFrom {
+        LogFrom {
+            attempt_id: format!("attempt-id-{}", &id),
+            routing_key: format!("routing-key-{}", &id),
+        }
+    }
+
+    #[test]
+    fn test_handle_for() {
+        let a = make_from("a.foo/123");
+        let b = make_from("b.foo/123");
+        let c = make_from("c.foo/123");
+        let d = make_from("d.foo/123");
+
+        let mut worker = make_worker("handle_for");
+        assert!(worker.handle_for(&a).is_ok());
+        assert!(worker.handle_for(&b).is_ok());
+        assert!(worker.handle_for(&c).is_ok());
+        assert!(worker.handle_for(&d).is_ok());
+        assert!(worker.handle_for(&a).is_ok());
+    }
+
+    #[test]
+    fn test_path_for() {
+        let worker = make_worker("path_for");
+
+        let path = worker
+            .path_for(&LogFrom {
+                attempt_id: String::from("my-attempt-id"),
+                routing_key: String::from("my-routing-key"),
+            })
+            .expect("the path should be valid");
+
+
+        assert!(path.starts_with(scratch_dir("path_for")));
+        assert!(path.ends_with("my-routing-key/my-attempt-id"));
+    }
+
+    #[test]
+    fn test_path_for_malicious() {
+        let worker = make_worker("for_malicious");
+
+        let path = worker.path_for(&LogFrom {
+            attempt_id: String::from("./../../"),
+            routing_key: String::from("./../../foobar"),
+        });
+
+        println!("path: {:?}", path);
+        assert!(path.is_err());
+    }
+
+    #[test]
+    fn test_validate_path_segment() {
+        assert!(validate_path_segment(&PathBuf::from("foo")).is_ok());
+        assert!(validate_path_segment(&PathBuf::from("foo/bar")).is_ok());
+        assert!(validate_path_segment(&PathBuf::from("foo.bar/123")).is_ok());
+        assert!(validate_path_segment(&PathBuf::from("..")).is_err());
+        assert!(validate_path_segment(&PathBuf::from(".")).is_err());
+        assert!(validate_path_segment(&PathBuf::from("./././")).is_err());
+        assert!(validate_path_segment(&PathBuf::from("")).is_err());
+        assert!(validate_path_segment(&PathBuf::from("foo/..")).is_err());
+        assert!(validate_path_segment(&PathBuf::from("foo/../bar")).is_err());
+        assert!(validate_path_segment(&PathBuf::from("foo/./bar")).is_ok());
+        assert!(validate_path_segment(&PathBuf::from("/foo/bar")).is_err());
+        assert!(validate_path_segment(&PathBuf::from("/foo")).is_err());
+    }
+
+
+    #[test]
+    fn test_open_log() {
+        let mut worker = make_worker("open-log");
+        assert!(
+            worker
+                .open_log(worker.path_for(&make_from("a")).unwrap())
+                .is_ok()
+        );
+        assert!(
+            worker
+                .open_log(worker.path_for(&make_from("b.foo/123")).unwrap())
+                .is_ok()
+        );
+    }
+
+    #[test]
+    pub fn test_logs_collect() {
+        let mut job = LogMessage {
+            from: make_from("foo"),
+            message: BuildLogMsg {
+                attempt_id: String::from("my-attempt-id"),
+                identity: String::from("my-identity"),
+                system: String::from("foobar-x8664"),
+                line_number: 1,
+                output: String::from("line-1"),
+            },
+        };
+
+        {
+            let mut worker = make_worker("simple-build");
+            assert_eq!(vec![worker::Action::Ack], worker.consumer(&job));
+
+            job.message.line_number = 5;
+            job.message.output = String::from("line-5");
+            assert_eq!(vec![worker::Action::Ack], worker.consumer(&job));
+
+            job.from.attempt_id = String::from("my-other-attempt");
+            job.message.attempt_id = String::from("my-other-attempt");
+            job.message.line_number = 3;
+            job.message.output = String::from("line-3");
+            assert_eq!(vec![worker::Action::Ack], worker.consumer(&job));
+        }
+
+        let root = scratch_dir("simple-build");
+
+        let mut p = root.clone();
+        let mut s = String::new();
+        p.push("routing-key-foo/attempt-id-foo");
+        File::open(p).unwrap().read_to_string(&mut s);
+        assert_eq!(&s, "line-1\n\n\n\nline-5\n");
+
+
+        let mut p = root.clone();
+        let mut s = String::new();
+        p.push("routing-key-foo/my-other-attempt");
+        File::open(p).unwrap().read_to_string(&mut s);
+        assert_eq!(&s, "\n\nline-3\n");
+    }
+}
diff --git a/ofborg/src/tasks/mod.rs b/ofborg/src/tasks/mod.rs
index 107e143..c8832fc 100644
--- a/ofborg/src/tasks/mod.rs
+++ b/ofborg/src/tasks/mod.rs
@@ -3,3 +3,4 @@ pub mod heartbeat;
 pub mod build;
 pub mod massrebuilder;
 pub mod githubcommentfilter;
+pub mod log_message_collector;
diff --git a/ofborg/src/worker.rs b/ofborg/src/worker.rs
index a742d92..32df03e 100644
--- a/ofborg/src/worker.rs
+++ b/ofborg/src/worker.rs
@@ -81,11 +81,15 @@ impl<T: SimpleWorker + Send> Consumer for Worker<T> {
         headers: BasicProperties,
         body: Vec<u8>,
     ) {
+        let job = self.internal.msg_to_job(&method, &headers, &body);
 
+        if let Err(e) = job {
+            error!("Error decoding job: {:?}", e);
+            channel.basic_ack(method.delivery_tag, false).unwrap();
+            return;
+        }
 
-
-        let job = self.internal.msg_to_job(&method, &headers, &body).unwrap();
-        for action in self.internal.consumer(&job) {
+        for action in self.internal.consumer(&job.unwrap()) {
             match action {
                 Action::Ack => {
                     channel.basic_ack(method.delivery_tag, false).unwrap();
diff --git a/ofborg/src/writetoline.rs b/ofborg/src/writetoline.rs
new file mode 100644
index 0000000..8b3c598
--- /dev/null
+++ b/ofborg/src/writetoline.rs
@@ -0,0 +1,178 @@
+use std::io::BufReader;
+use std::io::BufRead;
+use std::io::Write;
+use std::io::Seek;
+use std::io::SeekFrom;
+use std::fs::File;
+use std::io::Read;
+
+pub fn write_to_line(rw: &mut File, line: usize, data: &str) {
+
+    rw.seek(SeekFrom::Start(0)).unwrap();
+
+    let mut writeout: String = String::new();
+
+    {
+        let reader = BufReader::new(rw.try_clone().unwrap());
+        let mut lines: Vec<String> = reader
+            .lines()
+            .map(|line| match line {
+                Ok(s) => s,
+                Err(e) => format!("UTF-8 Decode err: {:?}", e),
+            })
+            .collect();
+        while lines.len() <= line {
+            lines.push("".to_owned());
+        }
+
+        lines.remove(line);
+        lines.insert(line, data.to_owned());
+
+        writeout = lines.join("\n");
+    }
+
+    rw.set_len(0).unwrap();
+    rw.seek(SeekFrom::Start(0)).unwrap();
+
+    let bytes = writeout.as_bytes();
+    rw.write_all(bytes).unwrap();
+    rw.write("\n".as_bytes()).unwrap();
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::process::Command;
+    use std::path::Path;
+    use std::path::PathBuf;
+    use std::fs::File;
+    use std::io::Read;
+    use std::fs::OpenOptions;
+
+    fn tpath(component: &str) -> PathBuf {
+        return Path::new(env!("CARGO_MANIFEST_DIR")).join(component);
+    }
+
+    fn scratch_file(name: &str) -> PathBuf {
+        tpath(&format!("./scratch-write-to-line-{}", name))
+    }
+
+    fn cleanup_scratch(name: &str) {
+        Command::new("rm")
+            .arg("-f")
+            .arg(&scratch_file(name))
+            .status()
+            .expect("cleanup of scratch_dir should work");
+    }
+
+    fn testfile(name: &str) -> File {
+        cleanup_scratch(&name);
+        OpenOptions::new()
+            .read(true)
+            .write(true)
+            .truncate(true)
+            .create(true)
+            .open(scratch_file(&name))
+            .expect("failed to open scratch file")
+    }
+
+    fn assert_file_content<T>(f: &mut T, value: &str)
+    where
+        T: Read + Seek,
+    {
+        let mut mystr: String = String::new();
+        f.seek(SeekFrom::Start(0)).unwrap();
+        f.read_to_string(&mut mystr).unwrap();
+        assert_eq!(mystr, value);
+    }
+
+    #[test]
+    fn test_writer_line_ordered() {
+        let mut f = testfile("ordered");
+
+        assert_file_content(&mut f, "");
+        write_to_line(&mut f, 0, "hello");
+        assert_file_content(&mut f, "hello\n");
+        write_to_line(&mut f, 1, "world");
+        assert_file_content(&mut f, "hello\nworld\n");
+        write_to_line(&mut f, 2, ":)");
+        assert_file_content(&mut f, "hello\nworld\n:)\n");
+    }
+
+    #[test]
+    fn test_writer_line_unordered() {
+        let mut f = testfile("unordered");
+
+        assert_file_content(&mut f, "");
+        write_to_line(&mut f, 2, ":)");
+        assert_file_content(&mut f, "\n\n:)\n");
+
+        write_to_line(&mut f, 1, "world");
+        assert_file_content(&mut f, "\nworld\n:)\n");
+
+        write_to_line(&mut f, 0, "hello");
+        assert_file_content(&mut f, "hello\nworld\n:)\n");
+    }
+
+
+    #[test]
+    fn test_writer_line_unordered_long() {
+        let mut f = testfile("unordered-long");
+
+        assert_file_content(&mut f, "");
+        write_to_line(
+            &mut f,
+            2,
+            "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        );
+        assert_file_content(
+            &mut f,
+            "\n\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n",
+        );
+
+        write_to_line(
+            &mut f,
+            1,
+            "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB",
+        );
+        assert_file_content(
+            &mut f,
+            "\nBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n",
+        );
+
+        write_to_line(
+            &mut f,
+            0,
+            "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
+        );
+        assert_file_content(
+            &mut f,
+            "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\nBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n",
+        );
+    }
+
+
+    #[test]
+    fn test_writer_line_unordered_longish() {
+        let mut f = testfile("unordered-longish");
+
+        assert_file_content(&mut f, "");
+        write_to_line(&mut f, 2, "hello");
+        assert_file_content(&mut f, "\n\nhello\n");
+
+        write_to_line(&mut f, 1, "mynameis");
+        assert_file_content(&mut f, "\nmynameis\nhello\n");
+
+        write_to_line(&mut f, 0, "graham");
+        assert_file_content(&mut f, "graham\nmynameis\nhello\n");
+    }
+
+    #[test]
+    fn test_writer_line_middle() {
+        let mut f = testfile("middle");
+
+        assert_file_content(&mut f, "");
+        write_to_line(&mut f, 5, "hello");
+        assert_file_content(&mut f, "\n\n\n\n\nhello\n");
+    }
+}