diff --git a/README.md b/README.md
index bb5af96..efc3bf0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # lettre
 [![Build Status](https://travis-ci.org/lettre/lettre.svg?branch=master)](https://travis-ci.org/lettre/lettre)
 [![Build status](https://ci.appveyor.com/api/projects/status/mpwglemugjtkps2d/branch/master?svg=true)](https://ci.appveyor.com/project/amousset/lettre/branch/master)
-[![Coverage Status](https://coveralls.io/repos/github/lettre/lettre/badge.svg?branch=master)](https://coveralls.io/github/lettre/lettre?branch=master)
 [![Crate](https://img.shields.io/crates/v/lettre.svg)](https://crates.io/crates/lettre)
 [![Docs](https://docs.rs/lettre/badge.svg)](https://docs.rs/lettre/)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
@@ -43,7 +42,7 @@ lettre = "0.6"
 
 ## Testing
 
-The tests require an open mail server listening locally on port 25 and the `sendmail` command.
+The tests require an open mail server listening locally on port 2525 and the `sendmail` command.
 
 ## License
 
diff --git a/lettre/CHANGELOG.md b/lettre/CHANGELOG.md
index ddba820..f12c1b1 100644
--- a/lettre/CHANGELOG.md
+++ b/lettre/CHANGELOG.md
@@ -3,7 +3,6 @@
 #### Features
 
 * **all**
-  * Update uuid crate to 0.4
   * Update env-logger crate to 0.4
   * Update openssl crate to 0.9
 
@@ -17,23 +16,10 @@
 
 #### Bugfixes
 
-* **email**
-  * #85: Use address-list for "To", "From" etc.
-
 * **tests**
   * #93: Force building tests before coverage computing
 
 ### v0.6.0 (2016-05-05)
 
-#### Features
+Nothing.
 
-* **email**
-  *  multipart support
-  *  add non-consuming methods for Email builders
-
-#### Beaking Change
-
-* **email**
-  * `add_header` does not return the builder anymore, 
-    for consistency with other methods. Use the `header`
-    method instead
diff --git a/lettre_email/CHANGELOG.md b/lettre_email/CHANGELOG.md
index ddba820..ecceb74 100644
--- a/lettre_email/CHANGELOG.md
+++ b/lettre_email/CHANGELOG.md
@@ -4,8 +4,6 @@
 
 * **all**
   * Update uuid crate to 0.4
-  * Update env-logger crate to 0.4
-  * Update openssl crate to 0.9
 
 ### v0.6.1 (2016-10-19)
 
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 0000000..0468aa5
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,2 @@
+reorder_imports = true
+reorder_imported_names = true