More logic to email retriver
Device mapping
Merge branch 'master' of https://github.com/cerijerome/ceri