Minor fixes and reorg.

Makefile

@@ -1,4 +1,4 @@
-REBAR = ./rebar
+REBAR = rebar
 DIALYZER = dialyzer
 
 .PHONY: plt analyze all deps compile get-deps clean
@@ -42,4 +42,4 @@ analyze: compile
 	ebin
 
 repl:
-	elr -pz deps/*/ebin -pa ebin
+	erl -pz deps/*/ebin -pa ebin

rebar.config

@@ -4,8 +4,6 @@
 {erl_opts, [debug_info,{d,'TRIQ',true},{parse_transform, lager_transform}]}.
 
 {deps, [
-
-%%
 %% Add riak_kv + riak_core as dependency to run backend tests
 %%
 %       {riak_kv, ".*", {git, "git://github.com/basho/riak_kv.git", {branch, "master"}}},
@@ -14,9 +12,9 @@
        {lager, ".*", {git, "git://github.com/basho/lager", {branch, "master"}}},
        {sext, ".*", {git, "git://github.com/esl/sext", {branch, "master"}}},
        {snappy, "1.0.*", {git, "git://github.com/fdmanana/snappy-erlang-nif.git", {branch, "master"}}},
+%       {lz4, ".*", {git, "git://github.com/gburd/erlang-lz4.git", {branch, "master"}}},
        {plain_fsm, "1.1.*", {git, "git://github.com/uwiger/plain_fsm", {branch, "master"}}},
        {ebloom, "1.1.*", {git, "git://github.com/basho/ebloom.git", {branch, "master"}}},
        {triq, ".*", {git, "git://github.com/krestenkrab/triq.git", {branch, "master"}}},
-       {proper, ".*", {git, "git://github.com/manopapad/proper.git",
+       {proper, ".*", {git, "git://github.com/manopapad/proper.git", {branch, "master"}}}
-                                                               {branch, "master"}}}
+       ]}.
-]}.