trim API name out of URI for 404s
doc generation improvements
llllllllllllllMerge branch 'new_branch_name'