Merge pull request #106 from Eric89GXL/add-el

ENH: Add EL testing
ENH: Trial identification scheme
FIX: Test for id_types
ENH: Improve test coverage
FIX: Fix EL test