merge in mako's
remove hammerhead's /bin
merge in mako's /bin, there was nothing flyme specific