Add obsoletes conflicts

Merging on top of gradle-1.9 to produce a clean PR. All work is done by @ngutzmann. (Though I added the docs). Replaces #25.