Switch merge to join and use keyword arguments

Revise documentation for recent changes