Documentation fixes

This is an attempt to fix the issues that are causing the documentation build to fail on Travis.