Merging release into makefile.
simplified the make process
minor build_yaml fix
Merging makefile into release.
Merging release into master.