FIX: vmrk parsing, ADD: edf modules to mne.fiff

Handle multiple spaces
Merge pull request #1191 from t3on/tb-brainvision-ENH

FIX: vmrk parsing, ADD: edf modules to mne.fiff
Merge remote-tracking branch 'upstream/master' into pathProblem