Minor fixes in the docs
Fix some fun column span alignment errors.
removed unused variables and imports, add used imports where missing.
COSMIT TYPO
Stop using some deprecated interfaces.
Merge pull request #3263 from amueller/minor_fixes_for_release

MRG Minor fixes for release