Rebase abergeron's travis test_doc and fix docs so it passes