Do not run haddock on travis-ci.
Merge branch 'arafura' into arafura-ci4osx

Conflicts:
	travis-ci/setup.sh