Merge pull request #1 from pagekite/master

Update to pagekite master
Merge pull request #2 from pagekite/master

Update to latest mailpile state
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
fix some tagnames
Merge pull request #1057 from cloudfleet/fix/tagnames

Fix/tagnames