may's account setting update
Merge branch 'master' of https://github.com/joshuatj/buku555.git
May's change to mailer