Merge, fix makefiles, and add build verbosity level