(Fixes #10)
Fix e-mail woes (closes #14) (closes #15)
Merge branch 'palloi'
Compile changes from Palloi (fixes #10)