Use NcsBlocksFactory and logical or.
Use NcsBlocksFactory and logical or.

# Conflicts:
#	neo/rawio/neuralynxrawio.py

apdavison/python-neo,INM-6/python-neo,JuliaSprenger/python-neo,samuelgarcia/python-neo,NeuralEnsemble/python-neo