Moving mvpa code towards pandas/csv-based event specification
Fixing nasty merge mess