diff --git a/.gitignore b/.gitignore
index 0aa159fd7..f8f1af339 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ _build
 .rebar3
 rebar3.crashdump
 .DS_Store
+rebar.config
diff --git a/.travis.yml b/.travis.yml
index 15834e620..8d4f7acc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,9 @@
 language: erlang
 
 otp_release:
-   - 19.0
-   - 19.1
-   - 19.2
+   - 20.0
 
-script: 
+script:
   - make
 
 sudo: false
diff --git a/Makefile b/Makefile
index 8203004c8..2826d547d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,13 @@ dep_gproc        = git https://github.com/uwiger/gproc
 dep_getopt       = git https://github.com/jcomellas/getopt v0.8.2
 dep_lager        = git https://github.com/basho/lager master
 dep_esockd       = git https://github.com/emqtt/esockd master
-dep_ekka         = git https://github.com/emqtt/ekka develop
+dep_ekka         = git https://github.com/emqtt/ekka master
 dep_mochiweb     = git https://github.com/emqtt/mochiweb master
 dep_pbkdf2       = git https://github.com/emqtt/pbkdf2 2.0.1
 dep_lager_syslog = git https://github.com/basho/lager_syslog
 dep_bcrypt       = git https://github.com/smarkets/erlang-bcrypt master
 dep_clique       = git https://github.com/emqtt/clique
-dep_jsx           = git https://github.com/talentdeficit/jsx
+dep_jsx          = git https://github.com/talentdeficit/jsx
 
 ERLC_OPTS += +debug_info
 ERLC_OPTS += +'{parse_transform, lager_transform}'
diff --git a/README.md b/README.md
index 6bb93dc47..0fbd3a118 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 # *EMQ* - Erlang MQTT Broker
 
 [![Build Status](https://travis-ci.org/emqtt/emqttd.svg?branch=master)](https://travis-ci.org/emqtt/emqttd)
-[<img src="http://slack.emqtt.io/badge.svg">](http://slack.emqtt.io)
 
 *EMQ* (Erlang MQTT Broker) is a distributed, massively scalable, highly extensible MQTT message broker written in Erlang/OTP.
 
diff --git a/rebar.config b/rebar.config
deleted file mode 100644
index 834382f05..000000000
--- a/rebar.config
+++ /dev/null
@@ -1,4 +0,0 @@
-{deps, [
-{goldrush,".*",{git,"https://github.com/basho/goldrush","0.1.9"}},{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{esockd,".*",{git,"https://github.com/emqtt/esockd","master"}},{ekka,".*",{git,"https://github.com/emqtt/ekka","develop"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb","master"}},{pbkdf2,".*",{git,"https://github.com/emqtt/pbkdf2","2.0.1"}},{lager_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}},{bcrypt,".*",{git,"https://github.com/smarkets/erlang-bcrypt","master"}}
-]}.
-{erl_opts, [debug_info,{parse_transform,lager_transform}]}.