Merge pull request #161 from krlmlr/trivial-doc

fix build warnings concerning package documentation
use union merge driver for NEWS.md
Merge branch 'union-merge' into 159-mocking
add NEWS item