Merge remote-tracking branch 'origin/master' into so-you-can-dexy-while-you-dexy

Conflicts:
	project/Build.scala
Produce CSS selector example specs for 2.11.

We need to mix in XmlMatchers to the Specification for the appropriate version
of specs2 to take.
Add dexy target/script for building API docs.

Right now this doesn’t work because json-scalaz.
Make build-api-docs script work standalone.

Running docs/scripts/build-api-docs.sh should now properly
send the resulting API documentation to target/docs/api.
Handle API docs for multiple scala versions.

Before, the copying part of the build-api-docs task was failing
because built API docs go to target/scala-<version>/api, not
just target/api. We now properly copy all versions into the
working directory.
Fix bulleted lists in CSS selectors documentation.
Drop some dexy shell timeouts.
Retarget API docs off of the base docs dir.

The build-api-docs script now puts the API docs in the
api/scala-<version> under the docs/ directory in the dexy
working directory.
Properly copy API docs to output directory.

This should also let us do further processing on the API docs.