Improve README
Delete second erlang.mk file
Merge branch 'next'
Less macros