- fixing document merging
- moving merging logic into document class
- added test
Merge pull request #1384 from bokeh/hotfix/doc_merging

- fixing document merging