merged doc changes to gh_pages