Merge pull request #480 from basho/features/csm/connection-manager

Port 1.4 changes to the 2.0 branch.

Author: cmeiklejohn

include/riak_core_connection.hrl

@@ -12,7 +12,6 @@
   {riak_sysmon, ".*", {git, "git://github.com/basho/riak_sysmon.git", {branch, "develop"}}},
   {folsom, "0.7.4p4", {git, "git://github.com/basho/folsom.git", {tag, "0.7.4p4"}}},
   {riak_ensemble, ".*", {git, "git://github.com/basho/riak_ensemble", {branch, "jdb-wip-2.0"}}},
-  {ranch, "0.4.0-p1", {git, "git://github.com/basho/ranch.git", {tag, "0.4.0-p1"}}},
   {pbkdf2, ".*", {git, "git://github.com/basho/erlang-pbkdf2.git", {branch, "adt-cleanups"}}},
   {eleveldb, ".*", {git, "git://github.com/basho/eleveldb.git", {branch, "master"}}}
 ]}.