Simplified list comprehension using np.in1d

* Also cosmetics
Merge branch 'tal' into trial_id (np.in1d instead of mapping)

Conflicts:
	mne/epochs.py