diff --git a/.editorconfig b/.editorconfig
index 79eda88..f1a02f1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,10 +1,12 @@
 root = true
 
 [*]
+charset = utf-8
 end_of_line = lf
 indent_size = 4
 indent_style = tab
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.json]
 indent_size = 2
diff --git a/README.md b/README.md
index ab4543c..29bf3ad 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # `toga-css`
 
-[![NPM version][npm-img]][npm-url] [![Downloads][downloads-img]][npm-url] [![Build Status][travis-img]][travis-url] [![Coverage Status][coveralls-img]][coveralls-url]
+[![NPM version][npm-img]][npm-url] [![Downloads][downloads-img]][npm-url] [![Build Status][travis-img]][travis-url] [![Coverage Status][coveralls-img]][coveralls-url] [![Chat][gitter-img]][gitter-url]
 
 Generates a [Toga](http://togajs.github.io) abstract syntax tree for CSS files using [Tunic](http://github.com/togajs/tunic).
 
@@ -31,7 +31,7 @@ toga
 
 ## Contribute
 
-[![Tasks][waffle-img]][waffle-url] [![Chat][gitter-img]][gitter-url] [![Tip][gittip-img]][gittip-url]
+[![Tasks][waffle-img]][waffle-url] [![Tip][gittip-img]][gittip-url]
 
 Standards for this project, including tests, code coverage, and semantics are enforced with a build tool. Pull requests must include passing tests with 100% code coverage and no linting errors.
 
@@ -48,7 +48,7 @@ Licensed under [MIT](http://shannonmoeller.com/mit.txt)
 [coveralls-img]: http://img.shields.io/coveralls/togajs/toga-css/master.svg?style=flat-square
 [coveralls-url]: https://coveralls.io/r/togajs/toga-css
 [downloads-img]: http://img.shields.io/npm/dm/toga-css.svg?style=flat-square
-[gitter-img]:    http://img.shields.io/badge/chat-togajs/toga-blue.svg?style=flat-square
+[gitter-img]:    http://img.shields.io/badge/gitter-join_chat-1dce73.svg?style=flat-square
 [gitter-url]:    https://gitter.im/togajs/toga
 [gittip-img]:    http://img.shields.io/gittip/shannonmoeller.svg?style=flat-square
 [gittip-url]:    https://www.gittip.com/shannonmoeller