adding rebar to Makefile and fleshing out targets
general cleanup of Makefile
Merge branch 'master' into simple-release