tweak Makefile for rebar3; touch up .gitignore

Author: Andrei Zavada

.gitignore

@@ -1,11 +1,10 @@
 _build/
+rebar.lock
 ebin/
-deps/
 tests/
 /basho_bench
 /rel/basho_bench
 package
-.rebar
 *~
 #*#
 .DS_Store

Makefile

@@ -6,17 +6,17 @@ PKG_ID           = basho-bench-$(PKG_VERSION)
 PKG_BUILD        = 1
 BASE_DIR         = $(shell pwd)
 ERLANG_BIN       = $(shell dirname $(shell which erl))
-REBAR           ?= $(BASE_DIR)/rebar
+REBAR           ?= $(BASE_DIR)/rebar3
 OVERLAY_VARS    ?=
 
 
 all: deps compile
-	$(REBAR) skip_deps=true escriptize
+	$(REBAR) escriptize
 
 .PHONY: deps compile rel lock locked-all locked-deps
 
 rel: deps compile
-	cd rel && $(REBAR) generate skip_deps=true $(OVERLAY_VARS)
+	cd rel && $(REBAR) generate $(OVERLAY_VARS)
 
 deps:
 	$(REBAR) get-deps