Cleanup for Haddock documentation.
Switch travis-ci image to 'new' branch.