Catch up on new additions
Add bmake
Remove hugs98