MISC : use + not - with combining conditions in epochs
Merge pull request #1094 from agramfort/misc

MISC : use + not - with combining conditions in epochs