Merge pull request #1223 from emqtt/issue#1221

Remove rebar.config to fix issue#1221

.gitignore

@@ -30,3 +30,4 @@ _build
 .rebar3
 rebar3.crashdump
 .DS_Store
+rebar.config

.travis.yml

@@ -1,11 +1,9 @@
 language: erlang
 
 otp_release:
-   - 19.0
-   - 19.1
-   - 19.2
+   - 20.0
 
-script: 
+script:
   - make
 
 sudo: false

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}'

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.