Merge pull request #5 from lennyvarghese/master

Backwards compatibility fixes
Merge branch 'master' of https://github.com/lennyvarghese/ANLffr into lennyvarghese-master
Updating bdf import to use mne.io instead of the old mne.fiff
Merge branch 'lennyvarghese-master'
Merge remote-tracking branch 'upstream/master'