Update some more requirements.
Re-work settings to fix Travis failure.