Moved merge into lutil.
Updated to use ltest instead of lunit.