FIX: plot.brain.activation()
Merge remote-tracking branch 'upstream/master'

Conflicts:
	eelbrain/plot/brain.py