bf/add_channels.c: Merged error message fix
python/show_any: Added options -p, -c, -i to choose epoch append type
python: Escape channel and file names in some more places;
fMRI_Correct.py: Temporary fix for collapse_channels currently not being
able to handle escaped channel names