Improved email parsing vastly
Merge branch 'master' of https://github.com/zbanks/musicazoo