FIX : viz test bug
ENH+FIX : topomap on evoked was broken for new neuromag systems
FIX: address layout is None
Merge pull request #632 from yousrabk/fix_layout_recent_neuromag

ENH+FIX : topomap on evoked was broken for new neuromag systems
FIX Remove code left by mistake during rebasing
Bringing back orientation picking tests
Merge pull request #635 from rgoj/fix-lcmv-pick-ori-example-bug

FIX Remove code left by mistake during rebasing breaking normal orientation picking
misc doc fixes
Merge pull request #638 from mluessi/misc_fixes

Misc. doc fixes
ENH : add IO support for fieldtrip .lay files
Merge pull request #640 from agramfort/io_fieldtrip_lay

ENH : add IO support for fieldtrip .lay files