Update rebar to 2.5.1
Update Makefile