Rebase onto master
attempt to import fit_sphere_to_headshape
nested import
Doc improvements + PEP8
Merge pull request #1619 from wmvanvliet/eeg-layout-fix

Topo plots for EEG data, even when no digitization points are present
- Fix issue where AverageTFR objects reported the wrong number of channels. Thanks to @t3on for help with...everything...about this.
Merge pull request #1651 from matthew-tucker/tfr_fix

AverageTFR repr fix
ENH: Allow not writing home
ENH: Add test case
Adding DPSS wavelets for TFR
Building DPSS wavelet list in different order to use existing convolve/fft code
First draft tfr_mtmconvolve
Adding logratio based z-score to baseline mode
BUG fix -- Use the right taper when computing in parallel
Adding text documentation for zlogratio
Adding tests for tfr_mtm
Adding some safegaurads against random test failures due to noise
Some improvements to doc-strings only
FIX: Forgot to change function name in test.. Oops
More docstring improvements.