FIX : bug tfr_morlet on single epoch
Merge pull request #1543 from agramfort/fix_tfr_one_epoch

FIX : bug tfr_morlet on single epoch
DOC : clarify docstrings in pick.py
FIX bump up the miniconda installation script
Merge pull request #1546 from agramfort/miniconda

FIX bump up the miniconda installation script
ENH: Add Zenodo
Automatic box size estimation.

When creating layouts on the fly with `make_eeg_layout` and
`make_grid_layout`, an appropriate box size is now automatically
generated.
Added tests for layout generation
small fixes to comments
Added test for n_col parameter of `make_grid_layout`
doc fixes
!= --> is not
PEP8 fixes
more PEP8 fixes
Merge branch 'marijn-layout-auto-box-size' of https://github.com/wmvanvliet/mne-python into marijn-layout-auto-box-size