Merge branch 'emq24' into develop

.gitignore

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

.travis.yml

@@ -3,7 +3,7 @@ language: erlang
 otp_release:
    - 20.0
 
-script: 
+script:
   - make
 
 sudo: false

Makefile

@@ -8,9 +8,9 @@ dep_goldrush     = git https://github.com/basho/goldrush 0.1.9
 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 develop
-dep_ekka         = git https://github.com/emqtt/ekka develop
-dep_mochiweb     = git https://github.com/emqtt/mochiweb develop
+dep_esockd       = git https://github.com/emqtt/esockd v5.2
+dep_ekka         = git https://github.com/emqtt/ekka v0.2.2
+dep_mochiweb     = git https://github.com/emqtt/mochiweb v4.2.1
 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