Merge branch 'beta'

A bit of a clean up of the code for listing library documentation.